diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:08:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:08:16 +0100 |
| commit | 421c65fdeef453fb01d0d65130075e6447463887 (patch) | |
| tree | 56efe6b62c42e7e77be2a752789ea4460f817dfa /drivers/spi/spi-rockchip.c | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| parent | 152bc19e2fc2b7fce7ffbc2a9cea94b147223702 (diff) | |
| parent | 5185a81c02d4118b11e6cb7b5fbf6f15ff7aff90 (diff) | |
Merge remote-tracking branches 'spi/fix/pax2xx' and 'spi/fix/rockchip' into spi-linus