Merge branch 'x86/cpu' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Sat, 23 Aug 2008 15:46:59 +0000 (17:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 23 Aug 2008 15:46:59 +0000 (17:46 +0200)
commit87ce786ae5f24e336195805a9fc7428a6f922478
tree4e756c5b49dadcd4b9cf46a1a0e3593ccadfb291
parent8067794bec1cc5de1431102cf0a6a1c7ce75cd85
parentf1c5d30e1d79bbfb60eaf189db862d3cb2bcac92
Merge branch 'x86/cpu' into x86/x2apic
12 files changed:
arch/x86/Kconfig
arch/x86/kernel/apic_32.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
include/asm-x86/cpufeature.h
include/asm-x86/hw_irq.h