]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01b9e04 f6bd03a)
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
authorMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
Conflicts (trivial overlapping cleanups):
drivers/spi/spi-atmel.c

1  2 
drivers/spi/spi-atmel.c patch | diff1 | diff2 | blob | history

diff --cc drivers/spi/spi-atmel.c
Simple merge
Linux kernel for KaRo TX COM modules