diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-04-24 10:45:39 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-04-24 10:45:39 +0100 |
| commit | c129e7099cd14ca6b7866d4466a554f1d98f509e (patch) | |
| tree | d2efbc39596f8d6116e00a3d9943a7ecdf4609bb /tools/gator/daemon/Child.h | |
| parent | 2c7554c9da93fd6a442cfa383eaba519e7e2b335 (diff) | |
| parent | b4a13f60e0fbd2be0cb4f2001810fc32412d7d70 (diff) | |
Merge branch 'lsk-3.10-armlt-fixes' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20150424
Conflicts:
arch/arm64/kernel/Makefile
Diffstat (limited to 'tools/gator/daemon/Child.h')
0 files changed, 0 insertions, 0 deletions