Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next

author Mark Brown <broonie@kernel.org>

Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)

committer Mark Brown <broonie@kernel.org>

Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
author Mark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
committer Mark Brown <broonie@kernel.org>
Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/Makefile
Simple merge
diff --cc drivers/spi/spi-mem.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Thu, 20 Dec 2018 16:01:30 +0000 (16:01 +0000)
committer	Mark 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