]> 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, 23 Sep 2011 03:02:18 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:02:18 +0000 (13:02 +1000)
commit650182eb4c0c7e9f89c0321ffb52f42a6e05dd95
tree9cd21890b5b3256d941aa3d52ed8ba2406f5eaac
parent47fd142fdc86d7e60f3a521ed3c039dcfa273365
parentc4a7d50e2d7b2c4401b92cdc92ddbb3d86df58ca
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/at91_mci.c
drivers/mmc/host/mmci.c
drivers/mmc/host/sdhci-tegra.c