Merge branch 'x86/cleanups' into x86/trampoline

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

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

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

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

diff --cc arch/x86/kernel/early-quirks.c
Simple merge

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