Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Sat, 30 Aug 2014 18:28:03 +0000 (19:28 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 30 Aug 2014 18:28:03 +0000 (19:28 +0100)

Trivial merge