tree 6db5fb34a2d590086e25f7f682fecb5f43e6b283
parent a1216394e620d0dfbb03c712ae3210e7b77c9e11
parent 8d4d08ce8319ae26227c4dd558405963c14c2037
author Mark Brown <broonie@linaro.org> 1377781145 +0100
committer Mark Brown <broonie@linaro.org> 1377781145 +0100

Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Conflicts:
	drivers/spi/spi-rspi.c