Merge branch 'imx/pinctrl' into imx/clock
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 13:30:52 +0000 (15:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 13:30:52 +0000 (15:30 +0200)
commit4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1
treeac23c7b80154a476db3882d92f079c50c919e2fa
parentc818f97bc3266f0fbf619f2348d951272f8ac335
parenta0f5e3631b07cabf624e7d818df76d47d9d21017
Merge branch 'imx/pinctrl' into imx/clock

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 dependencies between the pinctrl and clock changes
in imx.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-imx/mm-imx5.c
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/net/ethernet/freescale/fec.c
drivers/spi/spi-imx.c
drivers/tty/serial/imx.c