Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/axi', 'spi/fix/davinci...
authorMark Brown <broonie@kernel.org>
Tue, 17 Jan 2017 18:48:11 +0000 (18:48 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 17 Jan 2017 18:48:11 +0000 (18:48 +0000)

Trivial merge