Merge branch 'linus' into irq/core

Get upstream changes so pending patches won't conflict.