]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
drivers/mmc/mmc_block.c

Simple merge