| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Aug 29 13:59:05 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Aug 29 13:59:05 2013 +0100 |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 | |
| parent | a1216394e620d0dfbb03c712ae3210e7b77c9e11 [diff] | |
| parent | 8d4d08ce8319ae26227c4dd558405963c14c2037 [diff] |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata Conflicts: drivers/spi/spi-rspi.c