Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
1  2  3  4  5  6 
drivers/spi/spi.c
drivers/spi/spidev.c
include/linux/spi/spi.h
tools/Makefile

Simple merge
Simple merge
Simple merge
diff --cc tools/Makefile
Simple merge