Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:30:35 +0000 (16:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:30:35 +0000 (16:30 -0800)

Trivial merge