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)
commit8e9c238c3884c226f0cddc31cde87dd5df1a6500
treed6b4bb2f474580fd6f52e70447f8ed79d441a89d
parentf17578decc40df8fceff82b106582e30bdfb3189
parent7225b3fd0b6e224235fc50a69f70479ff96d5602
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
drivers/mmc/mmc_block.c