Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 4 Nov 2011 14:15:29 +0000 (23:15 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 4 Nov 2011 14:15:29 +0000 (23:15 +0900)

Trivial merge