Merge branch 'linus' into irq/genirq

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge