Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:43:40 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:43:40 +0000 (10:43 -0800)
commitf9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6
tree717e9fc0044e9d94dd363670cacc2dff9d5b4407
parentd354d9afe923eb08f7ee89128b38ddb6415de01d
parentf3e2628bed0d5a88ced8239b35f1534557f9631c
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
drivers/mmc/mmc_block.c