Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:51:35 +0000 (10:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:51:35 +0000 (10:51 +1100)

Trivial merge