Merge branch 'x86/x2apic' into x86/core
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:21:21 +0000 (09:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:21:21 +0000 (09:21 +0200)
commit9042763808c5285a1a61b45b0fe98a710a4c903c
tree349be736a3b56a64c8835df03f127959bfc6e0e0
parent446d27338d3b422dd3dfe496d0f362230994d059
parentaa3341a168883654d1b13f5931c5ed2762537831
Merge branch 'x86/x2apic' into x86/core

Conflicts:
arch/x86/kernel/cpu/common_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/cpu/intel_64.c
arch/x86/kernel/genx2apic_cluster.c
arch/x86/kernel/genx2apic_phys.c
include/asm-x86/cpufeature.h
include/asm-x86/processor.h