Merge branch 'linus-master'; commit 'v3.4-rc2' into next