Merge branch 'irq/affinity' into irq/core