Merge branch 'for-rmk' of git://git.marvell.com/orion

Merge branch 'orion-devel' into devel

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/configs/orion5x_defconfig
Simple merge

diff --cc arch/arm/mach-orion5x/common.h
Simple merge

diff --cc arch/arm/mach-orion5x/kurobox_pro-setup.c
Simple merge

diff --cc arch/arm/mm/proc-feroceon.S
index 2b8bb383755e66a6cfdbbabebcd1a7b757e6b7fe,207392f1ce8a15ae0cbf214fe4d818ebceffae17..0fe1f8fc348802777a02e42da50c58f56e2a2d9e
--- 1/arch/arm/mm/proc-feroceon.S
--- 2/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@@ -446,10 -449,28 +449,11 @@@ ENTRY(cpu_feroceon_switch_mm
        .align  5
  ENTRY(cpu_feroceon_set_pte_ext)
  #ifdef CONFIG_MMU
 -      str     r1, [r0], #-2048                @ linux version
 -
 -      eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
 -
 -      bic     r2, r1, #PTE_SMALL_AP_MASK
 -      bic     r2, r2, #PTE_TYPE_MASK
 -      orr     r2, r2, #PTE_TYPE_SMALL
 -
 -      tst     r1, #L_PTE_USER                 @ User?
 -      orrne   r2, r2, #PTE_SMALL_AP_URO_SRW
 -
 -      tst     r1, #L_PTE_WRITE | L_PTE_DIRTY  @ Write and Dirty?
 -      orreq   r2, r2, #PTE_SMALL_AP_UNO_SRW
 -
 -      tst     r1, #L_PTE_PRESENT | L_PTE_YOUNG        @ Present and Young?
 -      movne   r2, #0
 -
 -      str     r2, [r0]                        @ hardware version
 +      armv3_set_pte_ext wc_disable=0
        mov     r0, r0
        mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
- #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH)
+ #if defined(CONFIG_CACHE_FEROCEON_L2) && \
+       !defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
        mcr     p15, 1, r0, c15, c9, 1          @ clean L2 entry
  #endif
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB