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

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

Merge branch 'x86/x2apic' into x86/core

Conflicts:
arch/x86/kernel/cpu/common_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

arch/x86/kernel/cpu/common_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_cluster.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_phys.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history