Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 22:53:25 +0000 (14:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 22:53:25 +0000 (14:53 -0800)

Trivial merge