Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B