Merge branch 'x86/apic' into irq/numa