| commit | eaed435a7b870a38d89dbdb535c7842d618d3214 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 23 Jan 2012 22:50:30 +0000 (23 14:50 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 23 Jan 2012 22:50:30 +0000 (23 14:50 -0800) | ||
| tree | 75c2d90c7c1fa937fc83027699fad1455644df8e | treesnapshot (tar.gz zip) |
| parent | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 | commitdiff |
| parent | 3f07f355704bc2ae26399f17c6d5d46c9a3d78d1 | commitdiff |
Merge tag 'arm-soc-imx-move' of git://git./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.
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.
22 files changed: