Merge branch 'for-linus'