diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-04-03 18:17:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-03 18:17:55 +0200 |
| commit | 22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d (patch) | |
| tree | 9981477f6f9e4527a9598e636d0ffc7705a322a4 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core (diff) | |
| parent | perf: Always build the powerpc perf_arch_fetch_caller_regs version (diff) | |
| download | linux-dev-22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d.tar.xz linux-dev-22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions