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
..
2012-02-03 13:33:05 +01:00
2011-12-07 22:02:05 +00:00
2008-12-16 14:58:17 +01:00
2012-03-28 20:59:45 -07:00
2009-03-24 21:30:03 +01:00
2012-05-12 09:43:15 +08:00
2012-01-02 13:04:55 +01:00
2012-02-05 17:14:47 +01:00
2009-10-01 16:11:15 -07:00
2012-03-28 20:59:45 -07:00