Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:24:52 +0000 (15:24 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:24:52 +0000 (15:24 +0900)

Trivial merge