diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-06-08 18:59:28 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-06-08 18:59:28 +0100 |
| commit | 596c3d814761f48b88de47f5f9b4044815855a50 (patch) | |
| tree | 2382fdddef171e5b64540e607d6f1af1594a6dea /tools | |
| parent | b5ab112fa1e46a8e284d27620bfb1f2ed29e1ce8 (diff) | |
| parent | b404ea34a7144366a20663240720cab486b117f9 (diff) | |
Merge branch 'lsk-3.10-armlt-dma' into integration-lsk-3.10-juno-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions