Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...
authorMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:41 +0000 (00:51 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:41 +0000 (00:51 +0000)
1  2  3  4  5  6  7  8  9 
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-tegra114.c
drivers/spi/spi-ti-qspi.c
drivers/spi/spi-topcliff-pch.c
drivers/spi/spi-xcomm.c
drivers/spi/spi.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ffc1a2ebc4ca979de655b88e54fe8b9a47c0e39e,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,23756b0f90363c2f776718925cf7fba84d13c4a3,516643d243c6dc3576406bad88feb9009aa604a6..4eb9bf02996cf179cf3e6365421867aaf8a10593
@@@@@@@@@@ -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);