| commit | 2b2322d662237a4b635a755df15e21b9ff80716b | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Oct 03 17:25:40 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Oct 03 17:25:40 2013 +0100 |
| tree | d7ecd68f0158835dabcf650c40dfe3370d91ec98 | |
| parent | c70837908dc1b63298125e1b80064c4639d92fd2 [diff] | |
| parent | 0158026ccced1ae312233a6a46dc0b6edce3fb6c [diff] |
Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x Conflicts: drivers/spi/spi-clps711x.c