Merge remote-tracking branch 'origin/x86/fpu' into queue/x86/cpu

Use the union of 3.10 x86/cpu and x86/fpu as baseline.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc arch/x86/Kconfig.debug
Simple merge

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