Merge branch 'next' into for-linus

Prepare second set of changes for 3.6 merge window.