Merge branch 'linus' into x86/urgent, to refresh the tree

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge