Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 22 Nov 2005 03:00:05 +0000 (19:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 22 Nov 2005 03:00:05 +0000 (19:00 -0800)

Trivial merge