Merge branch 'x86/cpu' into x86/core
commit7203781c98ad9147564d327de6f6513ad8fc0f4e
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 15:08:42 +0000 (4 08:08 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 15:08:42 +0000 (4 08:08 -0700)
tree5c29a2a04a626bf08a0d56fd8a0068b3c92ad284
parent671eef85a3e885dff4ce210d8774ad50a91d5967
parentaf2e1f276ff08f17192411ea3b71c13a758dfe12
Merge branch 'x86/cpu' into x86/core

Conflicts:

arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
38 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/genx2apic_uv_x.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/numaq_32.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/mm/ioremap.c
include/asm-x86/amd_iommu_types.h
include/asm-x86/atomic_64.h
include/asm-x86/bugs.h
include/asm-x86/cpufeature.h
include/asm-x86/genapic_32.h
include/asm-x86/genapic_64.h
include/asm-x86/geode.h
include/asm-x86/io.h
include/asm-x86/irq_vectors.h
include/asm-x86/kexec.h
include/asm-x86/mce.h
include/asm-x86/mman.h
include/asm-x86/mmconfig.h
include/asm-x86/mmzone_32.h
include/asm-x86/msr.h
include/asm-x86/percpu.h
include/asm-x86/pgtable_64.h
include/asm-x86/processor.h
include/asm-x86/required-features.h
include/asm-x86/spinlock.h
include/asm-x86/uv/uv_bau.h
include/asm-x86/xen/hypervisor.h