]> git.baikalelectronics.ru Git - kernel.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)
commita7b856f05727221a0e3188e685aa2b4698691447
tree6d925383f444a242ebc77d167420efb7e6ad8d99
parent4e9cf0260bbad43465469285c364f05a06aa3f5b
parent0b8aef029619379e2ae9ae531747f93b7eb691af
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