Merge branch 'x86/cpu' into x86/core

diff --cc Documentation/kernel-parameters.txt
Simple merge

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

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

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/traps_64.c
Simple merge

diff --cc include/asm-x86/msr.h
Simple merge

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc include/asm-x86/processor.h
Simple merge