Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/imx' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:31 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:31 +0000 (20:57 +0000)

Trivial merge