Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Mon, 5 Sep 2011 03:52:08 +0000 (12:52 +0900)]

Trivial merge