Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 28 Oct 2011 05:16:43 +0000 (14:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 28 Oct 2011 05:16:43 +0000 (14:16 +0900)

Trivial merge