Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Thu, 31 Mar 2011 06:39:47 +0000 (15:39 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 31 Mar 2011 06:39:47 +0000 (15:39 +0900)

Trivial merge