Merge branch 'linus' into locking-for-linus