Merge branch 'x86/x2apic' into x86/core