]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sh/clkfwk' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2012 03:37:50 +0000 (12:37 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2012 03:37:50 +0000 (12:37 +0900)

Trivial merge