summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 22:33:40 +0100
committerMark Brown <broonie@kernel.org>2017-11-10 22:33:40 +0100
commit130555cf3b13ad9e187f52a2a3780af9d3b8714c (patch)
treed4a15bd1e398d8122544d91636896fcdcba6ad6f /drivers/spi
parentLinux 4.14-rc8 (diff)
parentspi: fix IDR collision on systems with both fixed and dynamic SPI bus numbers (diff)
parentspi: sh-msiof: Fix DMA transfer size check (diff)
downloadlinux-130555cf3b13ad9e187f52a2a3780af9d3b8714c.tar.xz
linux-130555cf3b13ad9e187f52a2a3780af9d3b8714c.zip
Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus