Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic...

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

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

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