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

Trivial merge