Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx', 'spi/topic...

author Mark Brown <broonie@kernel.org>

Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc drivers/spi/spidev.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
diff --cc tools/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 11 Jan 2016 16:48:35 +0000 (16:48 +0000)
committer	Mark 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	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/spi/spidev.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
tools/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history