Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Sun, 31 Aug 2014 12:46:19 +0000 (13:46 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 31 Aug 2014 12:46:19 +0000 (13:46 +0100)

Trivial merge