Merge branch 'next' into for-linus

Prepare first set of updates for 3.10 merge window.