Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 21:33:09 +0000 (13:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 21:33:09 +0000 (13:33 -0800)

Trivial merge