Merge branch 'x86/cleanups'

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

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

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

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