Merge branch 'spi-5.2' into spi-next

author Mark Brown <broonie@kernel.org>

Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)

committer Mark Brown <broonie@kernel.org>

Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)
author Mark Brown <broonie@kernel.org>
Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)
committer Mark Brown <broonie@kernel.org>
Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)
diff --cc drivers/spi/atmel-quadspi.c
Simple merge
diff --cc drivers/spi/spi-pxa2xx.c
Simple merge
diff --cc drivers/spi/spi-tegra114.c
Simple merge
diff --cc drivers/staging/Kconfig
Simple merge
diff --cc drivers/staging/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)
committer	Mark Brown <broonie@kernel.org>
	Thu, 2 May 2019 02:20:29 +0000 (11:20 +0900)
		1	2
drivers/spi/atmel-quadspi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-pxa2xx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-tegra114.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history