]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'sh/alphaproject' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 13 Jan 2011 09:38:28 +0000 (18:38 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 13 Jan 2011 09:38:28 +0000 (18:38 +0900)

Trivial merge