]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
authorIngo Molnar <mingo@elte.hu>
Sat, 11 Oct 2008 18:23:20 +0000 (20:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 11 Oct 2008 18:23:20 +0000 (20:23 +0200)
commit0afe2db21394820d32646a695eccf3fbfe6ab5c7
tree6d925383f444a242ebc77d167420efb7e6ad8d99
parentd84705969f898f294bc3fc32eca33580f14105bd
parent43603c8df97f246e8be7b9cc92a8f968a85108bd
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
12 files changed:
arch/x86/ia32/ia32_signal.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process.c
arch/x86/kernel/sigframe.h
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/traps_64.c
arch/x86/kvm/vmx.h
arch/x86/mm/init_64.c
include/asm-x86/cpufeature.h
include/asm-x86/thread_info.h
include/linux/ioport.h