Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 25 Jul 2012 04:13:09 +0000 (13:13 +0900)

Trivial merge