Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 26 Aug 2011 07:49:51 +0000 (16:49 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 26 Aug 2011 07:49:51 +0000 (16:49 +0900)

Trivial merge