Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl', 'spi/topic/fsl-espi...

diff --cc drivers/spi/spi-fsl-espi.c
Simple merge

diff --cc drivers/spi/spi-qup.c
Simple merge