Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:02 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:02 +0000 (11:31 -0800)

Trivial merge