Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

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

diff --cc lib/swiotlb.c
Simple merge