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)
Conflicts (trivial overlapping cleanups):
drivers/spi/spi-atmel.c

1  2 
drivers/spi/spi-atmel.c

Simple merge