diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 07:49:35 +0100 |
| commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (patch) | |
| tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-2a3ede8cb2ddee5885518e4232aca13056f9a6e0.tar.gz linux-2a3ede8cb2ddee5885518e4232aca13056f9a6e0.zip | |
Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions