Merge pull request #1 from torvalds/master

Pull request at 2013-12-19