diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-06-24 21:14:09 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-06-24 21:14:09 +0200 |
| commit | 46e4eb647a3050f84403cce664b97fbd473af25d (patch) | |
| tree | 0916fcabe4be687dd1828755131586bf19cb4243 | |
| parent | e05d8a52eb685f6659da2c8eeafcf78286baa6fd (diff) | |
| parent | b7bc570b7b6f2269ee35c4f17123e7e3d33591a9 (diff) | |
Merge branch 'v3.18.13-rt10' into v3.18.16-rt13
Used the "ours" merge strategy to throw away the previous -rt releases
0 files changed, 0 insertions, 0 deletions