diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-17 17:52:14 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-17 17:52:34 +0200 |
| commit | 04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (patch) | |
| tree | cca2a5ba9eb2ccbfb325660341f1741321df7690 /arch/arm/mach-omap2 | |
| parent | ARM: 7745/1: psci: fix building without HOTPLUG_CPU (diff) | |
| parent | ARM: mpu: Ensure that MPU depends on CPU_V7 (diff) | |
| download | linux-04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa.tar.xz linux-04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa.zip | |
Merge branch 'ja-nommu-for-rmk-v2' of git://linux-arm.org/linux-ja into devel-stable
This includes the following series sent earlier to the list:
- nommu-fixes
- R7 Support
- MPU support
I've left out the ARCH_MULTIPLATFORM/!MMU stuff that Arnd and I were
discussing today until we've reached a conclusion/that's had some more
review.
This is rebased (and re-tested) on your devel-stable branch because
otherwise there were going to be conflicts with Uwe's V7M work now that
you've merged that. I've included the fix for limiting MPU to CPU_V7.
Diffstat (limited to 'arch/arm/mach-omap2')
0 files changed, 0 insertions, 0 deletions