Merge branch 'spi-4.21' into spi-next
authorMark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:28 +0000 (16:01 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:28 +0000 (16:01 +0000)

Trivial merge