Merge pull request #1 from torvalds/master

Sync as of 10272014