Merge pull request #2 from torvalds/master

Sync as of 10272014