Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Mon, 23 May 2011 02:35:33 +0000 (11:35 +0900)]

Trivial merge