]> 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, 27 Sep 2011 03:15:15 +0000 (13:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 03:15:15 +0000 (13:15 +1000)
commit872f6e224b518881c167108488e3c63a21de39a8
tree645b5c4c603fa7970f897ee8c9b38c1ee0811401
parentf4a17ce0bc6d9e4acdb334c36b866a2d2643ffa9
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