Arnd Bergmann 4f5a9fd341 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>
2012-05-14 15:30:52 +02:00
..
2011-11-09 23:02:12 +08:00
2011-06-06 01:16:30 -06:00
2011-09-21 09:41:48 -06:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2012-03-07 19:18:49 -07:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2012-03-15 03:32:17 -06:00
2011-06-06 01:16:30 -06:00