Skip to content
Commit b3890e47 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parents 29bf4dbc 2a2662bf
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment