Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile...

diff --cc arch/arm/Kconfig
index d56d21c,a7b9070,f1d9297,f1d9297,03582fd,a19a526,6af6c79,db524e7,a19a526..9d26083
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
--- 8/arch/arm/Kconfig
--- 9/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@ -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 -6,10 +6,10 @@@@@@@@@@ config AR
                select HAVE_MEMBLOCK
                select RTC_LIB
                select SYS_SUPPORTS_APM_EMULATION
     -- -       select GENERIC_ATOMIC64 if (!CPU_32v6K)
     ++ +       select GENERIC_ATOMIC64 if (!CPU_32v6K || !AEABI)
                select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
                select HAVE_ARCH_KGDB
 -  -----       select HAVE_KPROBES if (!XIP_KERNEL)
 +  +++++       select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
                select HAVE_KRETPROBES if (HAVE_KPROBES)
                select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
                select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

diff --cc arch/arm/mach-realview/core.c
Simple merge

diff --cc arch/arm/mach-vexpress/ct-ca9x4.c
Simple merge

diff --cc drivers/pcmcia/sa1100_generic.c
Simple merge

diff --cc drivers/pcmcia/soc_common.c
Simple merge

diff --cc scripts/recordmcount.h
Simple merge