Merge branch 'linus' into irq/genirq