Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Wed, 28 Mar 2012 04:53:10 +0000 (13:53 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 28 Mar 2012 04:53:10 +0000 (13:53 +0900)

Trivial merge