Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 15 Nov 2005 20:46:57 +0000 (12:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 15 Nov 2005 20:46:57 +0000 (12:46 -0800)

Trivial merge