Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:33:40 +0000 (21:33 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:33:40 +0000 (21:33 +0000)

Trivial merge