summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-31 14:45:45 +0100
committerMark Brown <broonie@kernel.org>2015-08-31 14:45:45 +0100
commitc5992f610f78e6c9d0a78e8fef1066ad640e17e8 (patch)
tree85d5d6a169bd3832eeb64ba2f67892a88c3778aa /drivers
parentc92ec7c7ae99a371bbc69f0258888a0328ba4838 (diff)
parentf682c4ffd25a19594d21987c19a69fa123242eb7 (diff)
parent98c7863c36bdf20c07e38d8bea5261902b52f98d (diff)
parentbf9628373418328daf67b6508fc3713fc6f5067d (diff)
downloadlinux-c5992f610f78e6c9d0a78e8fef1066ad640e17e8.tar.bz2
Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/xcomm' and 'spi/topic/xlp' into spi-next