]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branches 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/rspi...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:41 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:41 +0000 (17:08 +0100)
1  2  3  4  5 
drivers/spi/spi-pxa2xx.c

Simple merge