Merge branches 'irq/genirq' and 'linus' into irq/core