summaryrefslogtreecommitdiff
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-11 14:28:35 +0700
committerMark Brown <broonie@kernel.org>2016-03-11 14:28:35 +0700
commitf91c75d6faefdded97d2ecbe8c4f9cf197f68110 (patch)
tree3f3b40f5baeef88a1dd8dda4eee48593c325dbe3 /drivers/spi/spi.c
parent6beb9fecbde45f09ea79a67ed5fd8d17e3bf6213 (diff)
parentee7683a31683c6368a66a83c555600dfd704e543 (diff)
parent2f6fdefb3503ff0600b5435c0c9ce43cb50d3f1a (diff)
parent49023d2e4ead0fc9e0896331037746b267d46ad4 (diff)
Merge remote-tracking branches 'spi/topic/doc', 'spi/topic/dw' and 'spi/topic/flash' into spi-next