Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 16:45:42 +0000 (08:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 16:45:42 +0000 (08:45 -0800)

Trivial merge