]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)

Trivial merge