]> 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, 25 Oct 2011 06:35:10 +0000 (17:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:35:10 +0000 (17:35 +1100)
commit643fe00be26b617c4246f3e0a745e122fb2a1907
treef1794825f92335c8738b8289662122cdc8b3b012
parent7e2614c0a60c4de3e3f16491a31ae069d78cb8f6
parenta4b35b6acf2e9edc52132d34015f0a90b02e2df2
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c
12 files changed:
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/au1xmmc.c
drivers/mmc/host/mmci.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/s3cmci.c
drivers/mmc/host/sdhci-tegra.c
lib/Kconfig.debug