Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
authorMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
commit381bd9517a7e611871694689c67901d189cf6a62
tree7f9492cbbb93039ef84722e518e2ca6e8ad0c364
parent01b9e0418689951c6ae4ba3b221bc42f49eb6407
parentf6bd03a746271f298aa5bfb6e049b245757efaed
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel

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