]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'spi/topic/dt' into spi-next
authorMark Brown <broonie@linaro.org>
Tue, 20 May 2014 22:28:10 +0000 (23:28 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 May 2014 22:28:10 +0000 (23:28 +0100)
1  2 
drivers/spi/spi.c

Simple merge