Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Thu, 28 Jun 2012 07:46:13 +0000 (16:46 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 28 Jun 2012 07:46:13 +0000 (16:46 +0900)

Trivial merge