Merge branch 'x86/irq' into perfcounters/core