Merge branch 'linus'; commit 'v3.1-rc1' into next