tree 7f9492cbbb93039ef84722e518e2ca6e8ad0c364
parent 01b9e0418689951c6ae4ba3b221bc42f49eb6407
parent f6bd03a746271f298aa5bfb6e049b245757efaed
author Mark Brown <broonie@linaro.org> 1381954601 +0100
committer Mark Brown <broonie@linaro.org> 1381954601 +0100

Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel

Conflicts (trivial overlapping cleanups):
	drivers/spi/spi-atmel.c