diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-06-01 12:10:19 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-06-01 12:10:19 +0200 |
| commit | 474271f666ce974ee183057c022325b3833ecb39 (patch) | |
| tree | b56eb4aa1f190b6e5f72481a80c45ad7d80c7869 | |
| parent | b0c29475265dfabd1a7cf9a99102b8f248d489eb (diff) | |
| parent | 42e00498fc431e7e3c2c7186d23510cb441623a4 (diff) | |
Merge branch 'v3.14.40-rt37' into v3.14.43-rt42
Used the "ours" merge strategy to throw away the previous -rt releases
0 files changed, 0 insertions, 0 deletions