]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'sh/st-integration' into sh/urgent
authorPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 07:01:22 +0000 (16:01 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 07:01:22 +0000 (16:01 +0900)

Trivial merge