Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 95186ef17e17e7d7a69bcd009af30cb13f7d991b,56e13bf22027d0ab7045d303b21885066b42b347..e84729bf13d4c3f617f1c7dd6c177fe8493c9597
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -109,10 -106,9 +110,11 @@@ ifeq ($(CONFIG_ARCH_SA1100),y
   textofs-$(CONFIG_SA1111)        := 0x00208000
  endif
   machine-$(CONFIG_ARCH_PXA)      := pxa
 + machine-$(CONFIG_ARCH_MMP)      := mmp
 +    plat-$(CONFIG_PLAT_PXA)      := pxa
   machine-$(CONFIG_ARCH_L7200)    := l7200
   machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
+  machine-$(CONFIG_ARCH_GEMINI)     := gemini
   textofs-$(CONFIG_ARCH_CLPS711X)   := 0x00028000
   machine-$(CONFIG_ARCH_CLPS711X)   := clps711x
   machine-$(CONFIG_ARCH_IOP32X)           := iop32x

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/include/asm/cacheflush.h
Simple merge

diff --cc arch/arm/include/asm/proc-fns.h
Simple merge

diff --cc arch/arm/include/asm/system.h
Simple merge

diff --cc arch/arm/mm/Kconfig
index a6230f7a24c8775994c7f75d1ffe52d4652cb076,bc3331863d9dd18eac6db66e64b0c44efda0123e..20979564e7ee3cc04825e43f4b4af42bc7fc65be
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -664,7 -684,7 +695,7 @@@ config CPU_CACHE_ROUND_ROBI
  
  config CPU_BPREDICT_DISABLE
        bool "Disable branch prediction"
-       depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7
 -      depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 || CPU_FA526
++      depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7 || CPU_FA526
        help
          Say Y here to disable branch prediction.  If unsure, say N.
  

diff --cc arch/arm/mm/Makefile
Simple merge