Merge remote-tracking branch 'spi/topic/butterfly' into spi-next
authorMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:23 +0000 (09:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:23 +0000 (09:51 +0100)
1  2 
drivers/spi/spi-butterfly.c

Simple merge