git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3fc4e0 aa167f3 2a9d92f)
Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next
authorMark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
1  2  3 
drivers/spi/Kconfig patch | diff1 | diff2 | diff3 | blob | history
drivers/spi/Makefile patch | diff1 | diff2 | diff3 | blob | history
drivers/spi/spi-mem.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-mem.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.