]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mmc/mmc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:40:35 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:40:35 +0000 (13:40 +1100)
commit30209d4763b11442585630634e24bcc962959278
treef0f0fce222e57fab3cc3fb217a49076ee0c8d27f
parentd37b27c6db070704f7b22e85496239775b2d1e35
parent8943b39afaa6d9774ed03fffb9afd6257fa2b428
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