linux/Documentation
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-04-23 14:23:32 +03:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2010-02-24 13:51:32 +01:00
2008-10-16 11:21:30 -07:00
2012-03-28 18:43:38 +01:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2011-11-02 16:07:02 -07:00
2012-01-27 13:28:53 +01:00
2012-03-31 13:31:23 -07:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2010-04-08 11:34:34 +02:00
2008-12-03 16:09:53 -07:00
2008-07-25 10:53:30 -07:00
2012-03-16 20:35:01 +00:00
2011-03-31 11:26:23 -03:00
2012-01-13 10:12:23 -08:00
2012-03-19 12:03:58 +01:00
2011-03-31 11:26:23 -03:00
2011-12-12 14:14:31 -08:00
2008-03-24 19:22:19 -07:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2009-07-01 22:36:22 +02:00
2011-03-07 13:20:05 -08:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2011-06-13 13:43:05 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2012-02-28 16:05:06 +01:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2010-07-19 10:56:54 +02:00
2010-03-16 11:47:56 +01:00
2012-01-02 13:04:55 +01:00