diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-07 09:23:12 +0100 |
| commit | 3f986eefc89c528bf2d398a6dc3637b743a7139e (patch) | |
| tree | 8a0b4ccffa3502b7907f6ce5ed50b7ca0092e5ee /tools/perf/scripts/python | |
| parent | Merge tag 'perf-core-for-mingo-4.17-20180305' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo-4.16-20180306' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
| download | wireguard-linux-3f986eefc89c528bf2d398a6dc3637b743a7139e.tar.xz wireguard-linux-3f986eefc89c528bf2d398a6dc3637b743a7139e.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
tools/perf/perf.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions