Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/common/mcpm_entry.c
Simple merge

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

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

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

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/entry-header.S
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/iwmmxt.S
index 2452dd1bef53b0eb719dcda0ce127c2f5ddaeec9,2452dd1bef53b0eb719dcda0ce127c2f5ddaeec9,2452dd1bef53b0eb719dcda0ce127c2f5ddaeec9,4bb029ea89170611919ef2414b99227753c6fd67..a5599cfc43cbb17280e26bc942c30853ab954c7f
--- 1/arch/arm/kernel/iwmmxt.S
--- 2/arch/arm/kernel/iwmmxt.S
--- 3/arch/arm/kernel/iwmmxt.S
--- 4/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@@@@ -18,17 -18,17 -18,17 -18,14 +18,18 @@@@@
    #include <asm/ptrace.h>
    #include <asm/thread_info.h>
    #include <asm/asm-offsets.h>
+++ #include <asm/assembler.h>
    
   -#if defined(CONFIG_CPU_PJ4)
   +#if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B)
    #define PJ4(code...)                code
    #define XSC(code...)
   -#else
   +#elif defined(CONFIG_CPU_MOHAWK) || \
   +    defined(CONFIG_CPU_XSC3) || \
   +    defined(CONFIG_CPU_XSCALE)
    #define PJ4(code...)
    #define XSC(code...)                code
   +#else
   +#error "Unsupported iWMMXt architecture"
    #endif
    
    #define MMX_WR0                     (0x00)

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

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