| commit | b3890e4704594fa23abe1395d1fafc97d3214be8 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Jan 28 15:48:59 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Jan 28 15:48:59 2015 +0100 |
| tree | 23e2659713e01779e8854363eb7d1fac49683d32 | |
| parent | 29bf4dbc9841366577ba44175b00c543ad1712d6 [diff] | |
| parent | 2a2662bf88e693d477ef08351d03934f7bc0b51c [diff] |
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>