diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-17 14:14:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-17 14:14:11 +0800 |
| commit | 03263ac9903481c204624cf2ed2fbbc8a1150a3a (patch) | |
| tree | 16e272faf0dcc716406a197191e5fb56924e6085 /tools/perf/util/evsel.c | |
| parent | 29703588215bbf281aed9aa8cdec0641757fb9e1 (diff) | |
| parent | 6917fd7ba6367512d24784ba24ff419c6d353f22 (diff) | |
Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4
Conflicts:
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/memory.h
arch/arm64/kernel/head.S
arch/arm64/kvm/hyp.S
Diffstat (limited to 'tools/perf/util/evsel.c')
0 files changed, 0 insertions, 0 deletions