Merge remote-tracking branch 'spi/fix/omap2-mcspi' into spi-omap2-mcspi
authorMark Brown <broonie@kernel.org>
Fri, 8 May 2015 11:48:27 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 8 May 2015 11:48:27 +0000 (12:48 +0100)

Trivial merge