]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge remote-tracking branch 'spi/topic/img-spfi' into spi-next
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:01 +0000 (23:09 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:01 +0000 (23:09 +0100)

Trivial merge