Merge branch 'spi-5.4' into spi-linus
authorMark Brown <broonie@kernel.org>
Fri, 22 Nov 2019 19:56:33 +0000 (19:56 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 22 Nov 2019 19:56:33 +0000 (19:56 +0000)

Trivial merge