Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus
authorMark Brown <broonie@kernel.org>
Thu, 6 Nov 2014 12:58:46 +0000 (12:58 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 6 Nov 2014 12:58:46 +0000 (12:58 +0000)

Trivial merge