Merge remote-tracking branch 'spi/fix/dma' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 19:05:25 +0000 (19:05 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 26 Nov 2014 19:05:25 +0000 (19:05 +0000)

Trivial merge