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

Trivial merge