]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi...
authorMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:08:22 +0000 (22:08 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:08:22 +0000 (22:08 +0100)

Trivial merge