Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
authorMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 11:02:26 +0000 (12:02 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 11:02:26 +0000 (12:02 +0100)
Conflicts:
drivers/spi/spi-ti-qspi.c


Trivial merge