summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-qup.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-30 09:14:14 -0700
committerMark Brown <broonie@kernel.org>2016-09-30 09:14:14 -0700
commit66b5a337d0280dc60eb89116fb033df1e4b2e515 (patch)
tree4f9940bd5734025f62f66c806b526efe735e366d /drivers/spi/spi-qup.c
parente2df04ed3be123fb53740303779e13748b9f8b65 (diff)
parent568852b7002414c81084f07c7e39e897229d3b6f (diff)
parenta3cfea0448905581c4dfc087342f5142793bcb66 (diff)
parent089bd46d8bc1fe5a28351e82e4adcaa5a40121b5 (diff)
parent9d04d8bc4c18765f6a1f7b632fffe47b4578fb26 (diff)
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/pic32-sqi', 'spi/topic/pxa2xx' and 'spi/topic/qup' into spi-next