diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-06-08 18:59:30 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-06-08 18:59:30 +0100 |
| commit | e9aa1d646edc96285f7bae9352b7733558b0c18f (patch) | |
| tree | 9e56126a37eb273e1932b2b695559a2c4a1b03cb /tools | |
| parent | 596c3d814761f48b88de47f5f9b4044815855a50 (diff) | |
| parent | 55042879144b4556a7b2ae48aa2bd1b5f76dfc93 (diff) | |
Merge branch 'lsk-3.10-armlt-asoc' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20150608
Conflicts:
arch/arm64/boot/dts/juno.dts
linaro/configs/vexpress64.conf
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions