Linus Torvalds
eaed435a7b
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
...
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM i.MX: Update defconfig
ARM i.MX: Merge i.MX5 support into mach-imx
ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed. I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
2012-01-23 14:50:30 -08:00
..
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:55 +00:00
2011-11-24 14:57:55 +00:00
2011-11-24 14:57:54 +00:00
2011-11-24 14:57:55 +00:00
2011-05-25 23:04:33 +08:00
2011-05-25 23:04:32 +08:00
2011-04-23 11:03:06 +08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-11-11 16:58:48 +09:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-07-11 14:43:28 +08:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-06-15 20:04:02 -07:00
2011-05-03 15:38:52 -04:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-11-06 13:54:56 +09:00
2011-11-10 15:32:27 +08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-11-10 15:32:27 +08:00
2012-01-09 17:06:36 +00:00
2011-11-16 08:37:53 +01:00
2011-10-17 09:13:40 +01:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2011-03-03 16:27:01 -05:00
2012-01-10 17:09:24 +09:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-11-29 13:25:22 +09:00
2011-11-10 15:32:27 +08:00
2010-06-10 07:12:18 +02:00
2012-01-10 16:57:48 +09:00
2010-06-10 07:12:18 +02:00
2011-07-20 17:20:52 -04:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-10-13 09:06:58 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-06-15 20:04:02 -07:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-12-08 18:02:23 -08:00
2011-05-03 02:38:02 -07:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-05-20 22:27:08 +01:00
2011-05-20 22:27:08 +01:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-03-12 08:05:19 +09:00
2010-06-10 07:12:18 +02:00
2011-03-12 08:05:19 +09:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-05-20 22:34:25 +01:00
2011-05-20 22:34:25 +01:00
2011-01-20 17:02:05 -08:00
2010-06-10 07:12:18 +02:00
2011-01-20 17:02:05 -08:00
2011-12-19 18:00:03 -08:00
2011-01-20 17:02:05 -08:00
2011-11-29 10:34:45 +01:00
2011-11-29 10:34:51 +01:00
2010-06-10 07:12:18 +02:00
2011-05-20 22:27:08 +01:00
2011-02-19 10:55:12 +00:00
2011-06-15 20:04:02 -07:00
2011-06-15 20:04:02 -07:00
2011-11-10 15:32:27 +08:00