]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'sh/clkfwk' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 Jan 2012 01:45:43 +0000 (10:45 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 Jan 2012 01:45:43 +0000 (10:45 +0900)

Trivial merge