path: root/drivers
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-23 14:50:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-23 14:50:30 -0800
commiteaed435a7b870a38d89dbdb535c7842d618d3214 (patch)
tree75c2d90c7c1fa937fc83027699fad1455644df8e /drivers
parenta99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (diff)
parent3f07f355704bc2ae26399f17c6d5d46c9a3d78d1 (diff)
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.
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions