| commit | 68e67d97e1f91ed11e041b67f3a1336f518c608f | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Dec 30 13:45:00 2013 +0000 |
| committer | Mark Brown <broonie@linaro.org> | Mon Dec 30 13:45:00 2013 +0000 |
| tree | 1de288bc05f1cf1bfec20200a60ffe99dcce77ae | |
| parent | 9e03d05eee4ca45ed12749ef6c26bf616262cdd2 [diff] | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda [diff] |
Merge tag 'v3.13-rc6' into spi-rcar To resolve spurious merge conflicts with fixes. Linux 3.13-rc6