Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile...
Russell King [Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000)]
1  2  3  4  5  6  7  8  9 
arch/arm/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-vexpress/ct-ca9x4.c
drivers/pcmcia/sa1100_generic.c
drivers/pcmcia/soc_common.c
scripts/recordmcount.h

@@@@@@@@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge