Skip to content
Snippets Groups Projects
Commit 0f8f86c7 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

Merge commit 'perf/core' into perf/hw-breakpoint 

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
parents dca2d6ac f39cdf25
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5313 additions and 4 deletions
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