Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf', 'spi/topic/fsl...

diff --cc drivers/spi/Kconfig
Simple merge

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

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

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

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