Merge remote-tracking branches 'spi/fix/imx' and 'spi/fix/sh-msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:57:21 +0000 (17:57 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:57:21 +0000 (17:57 +0000)

Trivial merge