| commit | d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa | |
| author | Arnd Bergmann <arnd@arndb.de> | |
| Tue, 9 Apr 2013 13:57:59 +0000 (9 15:57 +0200) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Tue, 9 Apr 2013 14:02:41 +0000 (9 16:02 +0200) | ||
| tree | fa4f48cd3b0efc23f2378caa1c8eb28d0ba0a4db | treesnapshot (tar.gz zip) |
| parent | 71f6424023cb9fa381efc7237ca05926b2b1ca9a | commitdiff |
| parent | d696e3f6585ddeb7bddbf0783b649fa669459a5c | commitdiff |
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>
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>
| arch/arm/Kconfig | diff1 | diff2 | blobhistory |
| arch/arm/Kconfig.debug | diff1 | diff2 | blobhistory |