diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:31 +0100 |
commit | 03689d2d75d38dd77c8148b742aa5a7befbcd736 (patch) | |
tree | bef38656c77f54882480ea5bb4b1767a8d337a80 /drivers/spi | |
parent | fad01e866afdbe01a1f3ec06a39c3a8b9e197014 (diff) | |
parent | 8f391222c06c27e072e306e7eefd41d39b68ec46 (diff) | |
parent | 2b16069a7af4a4e6f6c2e599afe1301d0655487e (diff) | |
download | linux-03689d2d75d38dd77c8148b742aa5a7befbcd736.tar.bz2 |
Merge remote-tracking branches 'spi/fix/qup' and 'spi/fix/topcliff-pch' into spi-linus