| commit | 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Jun 30 19:58:56 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Jun 30 19:58:56 2014 +0100 |
| tree | 16d625cdf57212c70b2eae5d86e3924ff3116031 | |
| parent | b0d0ce8b6b91a0f6f99045b6019fc4c824634fb4 [diff] | |
| parent | 8e3489f3b6c159079cf690d0913409e1178ccf2f [diff] |
Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof Conflicts: drivers/spi/spi-sh-msiof.c