]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'sh/urgent' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 1 Feb 2011 10:38:49 +0000 (19:38 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 1 Feb 2011 10:38:49 +0000 (19:38 +0900)

Trivial merge