]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:16:38 +0000 (12:16 -0600)
committerMark Brown <broonie@kernel.org>
Fri, 4 Nov 2016 18:16:38 +0000 (12:16 -0600)

Trivial merge