summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-trace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-01-28 17:48:59 +0300
committerIngo Molnar <mingo@kernel.org>2015-01-28 17:48:59 +0300
commitb3890e4704594fa23abe1395d1fafc97d3214be8 (patch)
tree23e2659713e01779e8854363eb7d1fac49683d32 /tools/perf/builtin-trace.c
parent29bf4dbc9841366577ba44175b00c543ad1712d6 (diff)
parent2a2662bf88e693d477ef08351d03934f7bc0b51c (diff)
downloadlinux-b3890e4704594fa23abe1395d1fafc97d3214be8.tar.xz
Merge branch 'perf/hw_breakpoints' into perf/core
The new hw_breakpoint bits are now ready for v3.20, merge them into the main branch, to avoid conflicts. Conflicts: tools/perf/Documentation/perf-record.txt Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-trace.c')
0 files changed, 0 insertions, 0 deletions