diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:57 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:57 +0100 |
| commit | 703dca558a55639c32158bd65bae44222193a1e4 (patch) | |
| tree | 830ab66d152a33d96042c32fceedc0468d54e548 /init | |
| parent | b76dbc19ecdad60742bd51fba34092a0c2d81dc6 (diff) | |
| parent | 90a59173ce59c546009067399c7c42df29d58730 (diff) | |
Merge branch 'lsk-3.10-armlt-asoc' into integration-lsk-3.10-juno-android
Conflicts:
arch/arm64/boot/dts/juno.dts
linaro/configs/vexpress64.conf
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions