Arnd Bergmann 6b204283f2 Merge branch 'imx/pinctrl' into imx/dt ... Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/fec.c drivers/spi/spi-imx.c drivers/tty/serial/imx.c This resolves some simply but annoying conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 15:23:13 +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 'imx/pinctrl' into imx/dt	2012-05-14 15:23:13 +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