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

Trivial merge