From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 7 Nov 2011 11:36:48 +0000 (+0100)
Subject: ARM i.MX: Merge i.MX5 support into mach-imx
X-Git-Tag: v3.3-rc2~44^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3;p=pandora-kernel.git

ARM i.MX: Merge i.MX5 support into mach-imx

This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx
and adjusts the Makefile/Kconfig entries in a way that it's possible
to compile i.MX5 together with i.MX3/6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
---

Reading git-diff-tree failed