]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'heads/sh-sci' into dt3-base
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:31 +0000 (17:14 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:31 +0000 (17:14 +0900)

Trivial merge