]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:53:54 +0000 (13:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:53:54 +0000 (13:53 +1100)
commitaa9a8e84b1ede116e03986b40d9e50e30d3eed1b
tree93fcb531d36d682ef793edc88403db78f1dea5f8
parent16c39e3b02899e4f74310f38aaa3fa2a3f0f5d10
parent1ee6123c443931759fb45b6fb2a6439baf89bd87
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