]> 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, 12 Oct 2011 03:15:40 +0000 (14:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 03:15:40 +0000 (14:15 +1100)
commit7228058d59e772fb0d2084b0cb2a3a09d06ce414
tree0b4fc3887377ab36d093bbd41716e34cbd7101fe
parent160b14ef721fe0e9e3b7aa093fc1c6079b9833e4
parenta0c8202a148f3208b0a6ab23b6839c142cb71800
Merge remote-tracking branch 'mmc/mmc-next'

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