Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next

diff --cc drivers/acpi/acpi_apd.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-ti-qspi.c
Simple merge

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

diff --cc include/linux/spi/spi.h
Simple merge