Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 3 Jul 2005 21:39:33 +0000 (14:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 3 Jul 2005 21:39:33 +0000 (14:39 -0700)

Trivial merge