aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-rockchip.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-04-04 10:05:49 -0700
committerMark Brown <broonie@kernel.org>2016-04-04 10:05:49 -0700
commitcb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7 (patch)
tree5637e0b0ff63cf31b38fab525b67d5e3f7f24ea6 /drivers/spi/spi-rockchip.c
parentMerge remote-tracking branch 'spi/fix/imx' into spi-linus (diff)
parentspi: omap2-mcspi: fix dma transfer for vmalloced buffer (diff)
parentspi: rockchip: fix probe deferral handling (diff)
downloadlinux-dev-cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7.tar.xz
linux-dev-cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7.zip
Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus