Merge remote-tracking branch 'spi/fix/cadence' into spi-linus
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:10 +0000 (12:17 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:10 +0000 (12:17 +0000)

Trivial merge