Merge branch 'spi-5.5' into spi-linus

author Mark Brown <[email protected]>

Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)

committer Mark Brown <[email protected]>

Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)
author Mark Brown <[email protected]>
Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)
committer Mark Brown <[email protected]>
Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)
diff --cc drivers/spi/spi-dw.c
Simple merge
diff --cc drivers/spi/spi-pxa2xx.c
Simple merge
author	Mark Brown <[email protected]>
	Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)
committer	Mark Brown <[email protected]>
	Thu, 23 Jan 2020 12:37:15 +0000 (12:37 +0000)
		1	2
drivers/spi/spi-dw.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-pxa2xx.c	patch \|	diff1 \|	diff2 \|	blob \| history