Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:36:31 +0000 (15:36 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:36:31 +0000 (15:36 -0700)

Trivial merge