spi: Merge up fixes

A patch for Qualcomm depends on some fixes.

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/spi/spi-cadence-quadspi.c
Simple merge

diff --cc drivers/spi/spi-zynqmp-gqspi.c
Simple merge

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