summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c0eee3 ed60453 ac61d14 28257f7 b230653 50005a8 cf562b4 3d09fbc 8a9618f)
raw | combined (merge: 3c0eee3 ed60453 ac61d14 28257f7 b230653 50005a8 cf562b4 3d09fbc 8a9618f)
author | Russell King <rmk+kernel@arm.linux.org.uk> | |
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000) | ||
committer | Russell King <rmk+kernel@arm.linux.org.uk> | |
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000) |
1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | |||
---|---|---|---|---|---|---|---|---|---|---|---|
arch/arm/Kconfig | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
arch/arm/mach-realview/core.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
arch/arm/mach-vexpress/ct-ca9x4.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
drivers/pcmcia/sa1100_generic.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
drivers/pcmcia/soc_common.c | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
scripts/recordmcount.h | patch | | diff1 | | diff2 | | diff3 | | diff4 | | diff5 | | diff6 | | diff7 | | diff8 | | diff9 | | blob | history |
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
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