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)
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h


Trivial merge