From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 17 Jun 2013 15:52:14 +0000 (+0100)
Subject: Merge branch 'ja-nommu-for-rmk-v2' of git://linux-arm.org/linux-ja into devel-stable
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa;p=linux-beck.git

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

04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa