Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:08:33 +0000 (15:08 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:08:33 +0000 (15:08 -0800)
1  2 
drivers/mmc/mmc_block.c

Simple merge