Merge pull request from torvalds/master