Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi...
authorMark Brown <broonie@kernel.org>
Wed, 7 Oct 2015 10:43:39 +0000 (11:43 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 7 Oct 2015 10:43:39 +0000 (11:43 +0100)

Trivial merge