Merge branch 'ja-nommu-for-rmk-v2' of git://linux-arm.org/linux-ja into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Jun 2013 15:52:14 +0000 (16:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Jun 2013 15:52:34 +0000 (16:52 +0100)
commit04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa
treecca2a5ba9eb2ccbfb325660341f1741321df7690
parentfdeb94b5dc5bf9db7b3e36f3f38089a554f6a108
parentde8297765def67ec40b69522f3e405a61e0217b3
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.