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

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

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

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

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

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

diff --cc drivers/spi/spi.c
index ffc1a2ebc4ca979de655b88e54fe8b9a47c0e39e,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,516643d243c6dc3576406bad88feb9009aa604a6..4eb9bf02996cf179cf3e6365421867aaf8a10593
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
--- 3/drivers/spi/spi.c
--- 4/drivers/spi/spi.c
--- 5/drivers/spi/spi.c
--- 6/drivers/spi/spi.c
--- 7/drivers/spi/spi.c
--- 8/drivers/spi/spi.c
--- 9/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@@@@@ -754,8 -591,9 -591,9 -591,9 -591,9 -591,9 -591,9 -591,9 -591,10 +754,9 @@@@@@@@@@ static int spi_transfer_one_message(str
                                            struct spi_message *msg)
         {
                struct spi_transfer *xfer;
 --------       bool cur_cs = true;
                bool keep_cs = false;
                int ret = 0;
++++++++        int ms = 1;
         
                spi_set_cs(msg->spi, true);