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

Trivial merge