Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:25:15 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:25:15 +0000 (15:25 -0800)

Trivial merge