]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:23:06 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:23:06 +0000 (14:23 +1100)
commita1817899c9409a8e7beea5a51cfa8b3e1266e5a7
treec8d4de2417af268f9be6af59a13fd0c15b64c368
parentc7dcb997ebad4aaeec20e94ce13671a303a26cba
parentc344e0c044b7634a93c5de18f6b009cea7a3870b
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.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/mmci.c
drivers/mmc/host/sdhci-tegra.c