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>

diff --cc arch/x86/include/asm/acpi.h
Simple merge

diff --cc arch/x86/include/asm/apic.h
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
index fe4837136e02b992d63c22251fe18da39f53cee2,08776a953487f826dad0acc84b5b6e35f6272387..a9d805f3920c2fa6322244362d9aa88a51198c57
--- 1/arch/x86/kernel/smpboot.c
--- 2/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();
  

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge