Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Sep 2005 17:16:47 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Sep 2005 17:16:47 +0000 (10:16 -0700)

Trivial merge