OSDN Git Service

Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:12:09 +0000 (10:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:12:09 +0000 (10:12 +1000)

Trivial merge