Merge pull request #1 from torvalds/master

merge torvalds master