Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 21:02:16 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 21:02:16 +0000 (14:02 -0700)

Trivial merge