Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <[email protected]>
Sat, 15 Oct 2005 00:16:35 +0000 (17:16 -0700)
committerLinus Torvalds <[email protected]>
Sat, 15 Oct 2005 00:16:35 +0000 (17:16 -0700)

Trivial merge