]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sh/clkfwk' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Fri, 24 Jun 2011 07:28:31 +0000 (16:28 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 24 Jun 2011 07:28:31 +0000 (16:28 +0900)

Trivial merge