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

4.5 KiB

Raw Blame History

View Raw