From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Mar 2011 07:29:44 +0000 (+0100)
Subject: Merge commit 'v2.6.38' into x86/mm
X-Git-Tag: v2.6.39-rc1~499^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2;p=linux.git

Merge commit 'v2.6.38' into x86/mm

Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2
diff --cc arch/x86/kernel/smpboot.c
index fe4837136e02,08776a953487..a9d805f3920c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -1074,8 -1137,10 +1074,8 @@@ void __init native_smp_prepare_cpus(uns
  	if (!skip_ioapic_setup && nr_ioapics)
  		enable_IO_APIC();
  
- 	end_local_APIC_setup();
+ 	bsp_end_local_APIC_setup();
  
 -	map_cpu_to_logical_apicid();
 -
  	if (apic->setup_portio_remap)
  		apic->setup_portio_remap();