summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 14:02:09 +0300
committerMark Brown <broonie@kernel.org>2015-11-04 14:02:09 +0300
commit8a9e77653fc2bc8590a471b58097f258248b9369 (patch)
tree0b9358903fa569608595b7ae3945eece44584aeb /drivers/spi
parentc2da04dc21e6687b6cd46a74667e08ab4f651c48 (diff)
parentf9b841af4c1c3c3b7ce3552ab5ee5d9c430e9c29 (diff)
parentd7ef54ca1219ddf99d56a0f7cf40912ab4c4bb0b (diff)
downloadlinux-8a9e77653fc2bc8590a471b58097f258248b9369.tar.xz
Merge remote-tracking branches 'spi/topic/coldfire' and 'spi/topic/dw' into spi-next