diff options
author | Mark Brown <broonie@kernel.org> | 2016-04-04 19:05:49 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-04 19:05:49 +0200 |
commit | cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7 (patch) | |
tree | 5637e0b0ff63cf31b38fab525b67d5e3f7f24ea6 /drivers/spi/spi-rockchip.c | |
parent | Merge remote-tracking branch 'spi/fix/imx' into spi-linus (diff) | |
parent | spi: omap2-mcspi: fix dma transfer for vmalloced buffer (diff) | |
parent | spi: rockchip: fix probe deferral handling (diff) | |
download | linux-cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7.tar.xz linux-cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7.zip |
Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus