Merge branch 'devel-stable' into for-next

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/kernel/entry-common.S
index 4bc816a74a2ee9e9e478165846f4b79680bb395c,85a72b0809ca11c445352c4f49b54a5b0638ba48..94104bf69719f896e51836ca8a048077086fbb0a
--- 1/arch/arm/kernel/entry-common.S
--- 2/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@ -360,18 -363,9 +363,19 @@@ ENTRY(vector_swi
        str     lr, [sp, #S_PC]                 @ Save calling PC
        str     r8, [sp, #S_PSR]                @ Save CPSR
        str     r0, [sp, #S_OLD_R0]             @ Save OLD_R0
+ #endif
        zero_fp
  
 +#ifdef CONFIG_ALIGNMENT_TRAP
 +      ldr     ip, __cr_alignment
 +      ldr     ip, [ip]
 +      mcr     p15, 0, ip, c1, c0              @ update control register
 +#endif
 +
 +      enable_irq
 +      ct_user_exit
 +      get_thread_info tsk
 +
        /*
         * Get the system call number.
         */

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

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

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

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

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

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

diff --cc arch/arm/mm/proc-v7.S
Simple merge