Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:17:54 +0000 (18:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:17:54 +0000 (18:17 -0800)

Trivial merge