Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patches against new
code I have in queue.