]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'spi/topic/orion' into spi-next
authorMark Brown <broonie@linaro.org>
Wed, 23 Oct 2013 10:51:03 +0000 (11:51 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 23 Oct 2013 10:51:03 +0000 (11:51 +0100)
1  2 
drivers/spi/spi-orion.c

Simple merge