Merge branch 'linus' into irq/core

Pick up upstream changes to avoid conflicts for pending patches.

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

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