Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/pic32-sqi', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 30 Sep 2016 16:14:14 +0000 (09:14 -0700)
commit66b5a337d0280dc60eb89116fb033df1e4b2e515
tree4f9940bd5734025f62f66c806b526efe735e366d
parente2df04ed3be123fb53740303779e13748b9f8b65
parent568852b7002414c81084f07c7e39e897229d3b6f
parenta3cfea0448905581c4dfc087342f5142793bcb66
parent089bd46d8bc1fe5a28351e82e4adcaa5a40121b5
parent9d04d8bc4c18765f6a1f7b632fffe47b4578fb26
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/pic32-sqi', 'spi/topic/pxa2xx' and 'spi/topic/qup' into spi-next
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-qup.c