Merge branch 'x86/apic'

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

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

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

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge