diff options
| author | Mark Brown <broonie@kernel.org> | 2016-04-04 10:05:49 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-04-04 10:05:49 -0700 |
| commit | cb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7 (patch) | |
| tree | 5637e0b0ff63cf31b38fab525b67d5e3f7f24ea6 /drivers/spi/spi-rockchip.c | |
| parent | 2b657a586a84ed65bb5f5af773140578ce5f15a0 (diff) | |
| parent | 3525e0aac91c4de5d20b1f22a6c6e2b39db3cc96 (diff) | |
| parent | e4c0e06f949b9493cafe952c3029576b47c2a7c4 (diff) | |
Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus