Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
authorMark Brown <[email protected]>
Tue, 17 Jan 2017 18:48:13 +0000 (18:48 +0000)
committerMark Brown <[email protected]>
Tue, 17 Jan 2017 18:48:13 +0000 (18:48 +0000)

Trivial merge