]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86/cpu' into x86/xsave
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
commitfe47784ba5cbb6b713c013e046859946789b45e4
tree6384958d55e29be0d2eb8ae78fa437c10636d8d6
parent83b8e28b14d63db928cb39e5c5ed2a548246bd71
parentaf2e1f276ff08f17192411ea3b71c13a758dfe12
Merge branch 'x86/cpu' into x86/xsave

Conflicts:

arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
37 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.c
arch/x86/kernel/cpu/common_64.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/setup.c
arch/x86/kernel/smpboot.c
arch/x86/power/cpu_32.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/i387.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