Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:13 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:13 +0000 (16:43 -0800)

Trivial merge