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

Trivial merge