]> 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, 30 Sep 2011 01:51:36 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:51:36 +0000 (11:51 +1000)
commitc67213b48d96231c1e0f9cb2fcdb858c89b2b206
treede3648c02925182f0f94ce0488d84b7109803078
parent8cff09b1b1e939f0e5553b2cd5f7ed515202f1ef
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