Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next

diff --cc arch/arm/Kconfig
index 0536e8d3cda3a2189dd94b3191c07ba9ac3dc054,45df48ba0b128dd408e2275687b1757c87e0ca74,34b728583dae4b1382bec36fc7e3dc5995c02b2b,45df48ba0b128dd408e2275687b1757c87e0ca74,45df48ba0b128dd408e2275687b1757c87e0ca74..b47457d9387cf0cef01ab2f04d5b3a0b9874d67a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@ -57,10 -57,10 -57,10 -57,10 -57,10 +57,10 @@@@@@ config AR
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_XZ
 ----   select HAVE_KPROBES if !XIP_KERNEL
 ++++   select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_MEMBLOCK
-- --   select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
++ ++   select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
        select HAVE_OPTPROBES if !THUMB2_KERNEL
        select HAVE_PERF_EVENTS

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

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

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

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

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

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

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

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