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 15:08:42 +0000 (08:08 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 4 Sep 2008 15:08:42 +0000 (08:08 -0700)
commit	7203781c98ad9147564d327de6f6513ad8fc0f4e
tree	5c29a2a04a626bf08a0d56fd8a0068b3c92ad284	tree \| snapshot
parent	671eef85a3e885dff4ce210d8774ad50a91d5967	commit \| diff
parent	af2e1f276ff08f17192411ea3b71c13a758dfe12	commit \| diff

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	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_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.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/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.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/mm/ioremap.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/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_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.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/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.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/mm/ioremap.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/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