Merge master.kernel.org:~rmk/linux-2.6-arm.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 10 Jul 2005 19:57:49 +0000 (12:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 10 Jul 2005 19:57:49 +0000 (12:57 -0700)

Trivial merge