Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:30:50 +0000 (09:30 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 Aug 2005 16:30:50 +0000 (09:30 -0700)

Trivial merge