tree 23e2659713e01779e8854363eb7d1fac49683d32
parent 29bf4dbc9841366577ba44175b00c543ad1712d6
parent 2a2662bf88e693d477ef08351d03934f7bc0b51c
author Ingo Molnar <mingo@kernel.org> 1422456539 +0100
committer Ingo Molnar <mingo@kernel.org> 1422456539 +0100

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>