Merge branch 'x86/apic' into x86/core