Merge pull request #1 from torvalds/master

	Merge pull request #1 from torvalds/master