]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:50:50 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:50:50 +0000 (13:50 +1100)
commitfb78f9b0271768c3ae10b84ca46bffe44b2f7155
treeef2f4ceb8d367e8705abec15dd643ca6acf3f5e2
parent1d2f664541bf29e65a715d1986e2f5ef779b05ca
parent8943b39afaa6d9774ed03fffb9afd6257fa2b428
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-mackerel.c
drivers/mmc/card/block.c
drivers/mmc/host/Kconfig
drivers/mmc/host/at91_mci.c
drivers/mmc/host/au1xmmc.c
drivers/mmc/host/mmci.c
drivers/mmc/host/s3cmci.c
drivers/mmc/host/sdhci-tegra.c
lib/Kconfig.debug