From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 13:57:59 +0000 (+0200)
Subject: Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux... 
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~67^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa;p=pandora-kernel.git

Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/multiplatform

From Shawn Guo <shawn.guo@linaro.org>:

The mxs multiplatform support for 3.10:

* It enables the multiplatform build for mach-mxs platform.

* tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: enable multiplatform build
  ARM: mxs: rename debug-macro.S for multiplatform build
  ARM: mxs: call mxs_pm_init() as a machine_desc hook

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa
Reading git-diff-tree failed