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

diff --cc arch/arm/Kconfig
index d56d21c0573ba519b36d7f1e4012eb609dfbb664,a7b9070b661e1c65c61a3a1c227bd31813736418,f1d9297b105084be1f3718213fd592e0dd0d1747,f1d9297b105084be1f3718213fd592e0dd0d1747,03582fd14b879eecc520745743b435c38d734c35,a19a5266d5fc989327d2f5e82b8068e13462a5b8,6af6c79ade2e3207b980e70ab64ed817874de528,db524e75c4a21e4f45bc4b72e459adcdaf1dda4b,a19a5266d5fc989327d2f5e82b8068e13462a5b8..9d26083633902078535c96f6445e3249ddd9d2d0
--- 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