Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:53:33 +0000 (15:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:53:33 +0000 (15:53 -0800)

Trivial merge