]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 03:35:15 +0000 (13:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 03:35:15 +0000 (13:35 +1000)
commit3c2fd7644d93e56ea06c0b2dc51e2a63957422ea
treed28069229b549d618069227e819034937303c5a2
parenta70a621ae2f511a3b4594c4704c1c09680472815
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