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
..
2012-04-27 12:15:45 -06:00
2012-04-27 12:15:45 -06:00
2011-10-31 19:32:17 -04:00
2011-12-07 21:57:49 +01:00
2011-11-09 23:02:12 +08:00
2011-10-31 19:32:17 -04:00
2012-04-27 11:19:15 -06:00
2012-04-27 12:20:39 -06:00
2012-04-27 12:17:25 -06:00
2011-06-06 01:16:30 -06:00
2011-10-31 19:32:17 -04:00
2011-10-31 19:32:17 -04:00
2011-10-25 00:35:47 +02:00
2012-03-30 16:46:22 -06:00
2012-03-21 19:20:22 +05:30
2011-10-31 19:32:17 -04:00
2012-03-09 15:33:15 -07:00
2012-04-05 15:25:50 -07:00
2011-09-21 09:41:48 -06:00
2012-04-27 11:11:28 -06:00
2012-03-15 15:14:24 -06:00
2011-06-06 01:16:30 -06:00
2011-06-06 01:16:30 -06:00
2012-03-30 16:46:22 -06:00
2011-12-07 22:17:39 +01:00
2012-05-14 15:30:52 +02:00
2011-06-06 01:16:30 -06:00
2011-10-25 00:35:47 +02:00
2011-10-25 00:35:47 +02:00
2011-10-25 00:35:47 +02:00
2012-02-01 17:10:52 -07:00
2011-10-31 19:32:17 -04:00
2012-02-15 12:57:00 -07:00
2011-06-06 01:16:30 -06:00
2012-03-28 18:30:03 +01:00
2012-03-16 04:28:40 +00:00
2012-04-27 12:07:40 -06:00
2011-10-25 00:35:47 +02:00
2012-03-09 15:33:15 -07: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-01-31 20:06:27 +09:00
2012-03-15 03:32:17 -06:00
2012-03-15 03:41:50 -06:00
2011-10-31 19:32:17 -04:00
2011-10-31 19:32:17 -04:00
2012-03-07 19:18:45 -07:00
2012-03-09 14:51:11 -07:00
2011-10-25 00:35:47 +02:00
2011-10-25 00:35:47 +02:00
2011-10-31 19:32:17 -04:00
2011-10-31 19:32:17 -04:00
2012-03-29 15:34:57 -07:00
2011-10-31 19:32:17 -04:00
2011-10-25 00:35:47 +02:00
2012-03-15 03:30:33 -06:00
2011-06-06 01:16:30 -06:00