Merge branch 'x86/apic' into perfcounters/core