From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jan 2012 22:50:30 +0000 (-0800)
Subject: Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.3-rc2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaed435a7b870a38d89dbdb535c7842d618d3214;p=pandora-kernel.git

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.
---

eaed435a7b870a38d89dbdb535c7842d618d3214
Reading git-diff-tree failed