Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ... Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-31 09:45:46 +02:00
..
apic.c	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-13 10:35:48 -07:00
apic_flat_64.c
apic_noop.c
bigsmp_32.c
es7000_32.c	x86/apic/es7000_32: Remove unused variable	2010-07-08 09:14:37 +02:00
hw_nmi.c	x86, watchdog: Fix build error in hw_nmi.c	2010-05-13 09:12:39 +02:00
io_apic.c	x86, apic: Fix apic=debug boot crash	2010-08-20 10:18:28 +02:00
ipi.c
Makefile	lockup_detector: Cross arch compile fixes	2010-05-16 04:25:14 +02:00
nmi.c	Merge commit 'v2.6.34-rc7' into perf/nmi	2010-05-12 23:20:33 +02:00
numaq_32.c	x86, memblock: Replace e820_/_early string with memblock_	2010-08-27 11:13:47 -07:00
probe_32.c
probe_64.c
summit_32.c
x2apic_cluster.c
x2apic_phys.c
x2apic_uv_x.c	x86, UV: Make kdump avoid stack dumps	2010-07-21 11:33:27 -07:00