]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:30:29 +0000 (14:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:30:29 +0000 (14:30 +1100)
commit1fb28484e0623e95cd20f31b80dc84d5dd358f59
treebd0529132aa836d4150765019829d6446545faac
parent4c4a41ecd7ebb05e1a180f1399a47432d709efca
parented945919a6e0556acbcd92d39f3bec4d6d290b11
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/card/block.c
arch/arm/plat-samsung/include/plat/sdhci.h
drivers/mmc/host/at91_mci.c
drivers/mmc/host/mmci.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/mxs-mmc.c
drivers/mmc/host/sdhci-s3c.c
drivers/mmc/host/sh_mmcif.c