pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

author	H. Peter Anvin <hpa@zytor.com>
	Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
commit	fe47784ba5cbb6b713c013e046859946789b45e4
tree	6384958d55e29be0d2eb8ae78fa437c10636d8d6	tree \| snapshot
parent	83b8e28b14d63db928cb39e5c5ed2a548246bd71	commit \| diff
parent	af2e1f276ff08f17192411ea3b71c13a758dfe12	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/mpparse.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/numaq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/paravirt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/cpu_32.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/amd_iommu_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/atomic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/bugs.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/geode.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kexec.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mce.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mman.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmconfig.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmzone_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/msr.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/percpu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/required-features.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uv/uv_bau.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/hypervisor.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/mpparse.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/numaq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/paravirt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/cpu_32.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/amd_iommu_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/atomic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/bugs.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/geode.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kexec.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mce.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mman.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmconfig.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmzone_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/msr.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/percpu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/required-features.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uv/uv_bau.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/hypervisor.h	diff1 \|	diff2 \|	blob \| history