Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 17 Jul 2005 03:05:41 +0000 (20:05 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 17 Jul 2005 03:05:41 +0000 (20:05 -0700)

Trivial merge