Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)

Trivial merge