diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
| commit | 65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch) | |
| tree | 02b22c99008630010f28f45f502f55915f1014c2 /tools/perf/scripts/python/bin | |
| parent | Merge tag 'perf-core-for-mingo-20160415' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
| parent | perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation (diff) | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions