Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 24 Feb 2012 04:23:23 +0000 (13:23 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 24 Feb 2012 04:23:23 +0000 (13:23 +0900)

Trivial merge