]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'spi/topic/butterfly' into spi-next
authorMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 22:33:32 +0000 (23:33 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 22:33:32 +0000 (23:33 +0100)
1  2 
drivers/spi/spi-butterfly.c

Simple merge