Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/kvm/mmu.c
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/arm/mm/proc-v7.S
index 73398bcf9bd8ea8d7293803828cb837306742fb7,73398bcf9bd8ea8d7293803828cb837306742fb7,0b5462a941a6c30a58f0927c19c9e5c0f3879174,e7d45d529a2113556fee1c60ece3af68bf2b35cd..c63d9bdee51e65cab7bbad13632207702db41273
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
--- 3/arch/arm/mm/proc-v7.S
--- 4/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@@@ -75,15 -75,15 -75,15 -75,14 +75,15 @@@@@ ENTRY(cpu_v7_do_idle
    ENDPROC(cpu_v7_do_idle)
    
    ENTRY(cpu_v7_dcache_clean_area)
   -    ALT_SMP(mov     pc, lr)                 @ MP extensions imply L1 PTW
   -    ALT_UP(W(nop))
   -    dcache_line_size r2, r3
   -1:  mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
   +    ALT_SMP(W(nop))                 @ MP extensions imply L1 PTW
   +    ALT_UP_B(1f)
   +    mov     pc, lr
   +1:  dcache_line_size r2, r3
   +2:  mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
        add     r0, r0, r2
        subs    r1, r1, r2
   -    bhi     1b
   -    dsb
   +    bhi     2b
--      dsb
++ +    dsb     ishst
        mov     pc, lr
    ENDPROC(cpu_v7_dcache_clean_area)