Merge branch 'for-linus' into for-linus-3.12