Arnd Bergmann deb88cc3c6 Merge branch 'drivers/mmc' into next/dt2 ... Changes in the dt2 branch move stuff around that gets changed in the drivers/mmc branch. I chose a non-obvious resolution by adding the new bus-width property into all the tegra sdhci device nodes. Conflicts: arch/arm/boot/dts/tegra-cardhu.dts arch/arm/boot/dts/tegra-harmony.dts arch/arm/boot/dts/tegra-ventana.dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-15 13:44:11 +02:00
..
card	mmc: remove MMC bus legacy suspend/resume method	2012-04-20 20:30:19 -04:00
core	mmc: core: Do not pre-claim host in suspend	2012-04-20 21:52:13 -04:00
host	Merge branch 'drivers/mmc' into next/dt2	2012-05-15 13:44:11 +02:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile	mmc: sdhci-pci: add platform data	2012-01-11 23:58:47 -05:00