Merge branches 'x86/asm', 'x86/cleanups' and 'x86/headers' into x86/core

diff --cc arch/x86/boot/compressed/head_32.S
Simple merge

diff --cc arch/x86/boot/compressed/head_64.S
Simple merge

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