Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/pic32-sqi', 'spi/topic...

author Mark Brown <broonie@kernel.org>

Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)

committer Mark Brown <broonie@kernel.org>

Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
author Mark Brown <broonie@kernel.org>
Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
committer Mark Brown <broonie@kernel.org>
Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-qup.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
committer	Mark Brown <broonie@kernel.org>
	Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
		1	2	3	4	5
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/spi-qup.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history