Merge branch 'spi-4.21' into spi-5.0
authorMark Brown <broonie@kernel.org>
Mon, 7 Jan 2019 12:42:08 +0000 (12:42 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 7 Jan 2019 12:42:08 +0000 (12:42 +0000)

Trivial merge