]> 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, 5 Oct 2011 03:48:21 +0000 (14:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:48:21 +0000 (14:48 +1100)
commite03120a4e17afc1f9cfaa3c7aacd7baeb8e91182
tree7fe01a962f9ae4b4b690f64dfcc0c6d73e0882ce
parent39c9b53827ac3f09729ebe8501f41804d7663358
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