Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 3 Aug 2005 20:09:43 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 3 Aug 2005 20:09:43 +0000 (13:09 -0700)

Trivial merge