Merge pull request #2 from torvalds/master

合并作者的更新