Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:32:52 +0000 (13:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:32:52 +0000 (13:32 -0800)

Trivial merge