summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-30 13:17:29 +0100
committerMark Brown <broonie@kernel.org>2016-06-30 13:17:29 +0100
commit2a9b27b326d67dcd1bca066bc35c709da972833c (patch)
tree08c84596a06f514d6955428a38b800467cf647fc /drivers/spi
parent4c2e07c6a29e0129e975727b9f57eede813eea85 (diff)
parentbea8205feeb1d28841541814ae375defb5b1986b (diff)
parent4dc0dd83603f05dc3ae152af33ecb15104c313f3 (diff)
parent719bd6542044efd9b338a53dba1bef45f40ca169 (diff)
parent3ac066e2227cb272c097f34475247fa0a6cdd2ff (diff)
Merge remote-tracking branches 'spi/fix/ep93xx', 'spi/fix/rockchip', 'spi/fix/sunxi' and 'spi/fix/ti-qspi' into spi-linus