tree 2f629a4cfa71276b4afe947232f934f9b0887e7d
parent 3b3a80019ff194e86e740ec2f013a8915efd1ccf
parent 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3
author Mark Brown <broonie@linaro.org> 1381143746 +0100
committer Mark Brown <broonie@linaro.org> 1381143746 +0100

Merge remote-tracking branch 'spi/topic/devm' into spi-qspi

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