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)
commitdabefd56c6ee883bae0bdce4d5396c3f21286ab8
tree2f629a4cfa71276b4afe947232f934f9b0887e7d
parent3b3a80019ff194e86e740ec2f013a8915efd1ccf
parent2fe7e4add3e53df7c1b97e32076f8390dd81c6b3
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi

Conflicts:
drivers/spi/spi-ti-qspi.c
drivers/spi/spi-ti-qspi.c