summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-24 23:08:22 +0200
committerMark Brown <broonie@kernel.org>2016-07-24 23:08:22 +0200
commitac3e62b8208b655bfee8d33c38664c5ca1ff8a61 (patch)
tree2146c662693e7cdb7d2b19635934e9cabc2e4fd1 /drivers/spi
parentMerge remote-tracking branches 'spi/topic/flash-dma', 'spi/topic/imx', 'spi/t... (diff)
parentspi: octeon: Split driver into Octeon specific and common parts (diff)
parentspi: omap2-mcspi: Use the SPI framework to handle DMA mapping (diff)
parentspi: orion: Fix return value check in orion_spi_probe() (diff)
parentspi: pic32: fixup wait_for_completion_timeout return handling (diff)
parentspi: pic32-sqi: fixup wait_for_completion_timeout return handling (diff)
downloadlinux-ac3e62b8208b655bfee8d33c38664c5ca1ff8a61.tar.xz
linux-ac3e62b8208b655bfee8d33c38664c5ca1ff8a61.zip
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi/topic/orion', 'spi/topic/pic32' and 'spi/topic/pic32-sqi' into spi-next