Merge branch 'linus' into irq/core

Pick up upstream changes to avoid conflicts for pending patches.