Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/imx' and 'spi/fix/rockchi...
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:08:56 +0000 (23:08 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:08:56 +0000 (23:08 +0100)

Trivial merge