• Frederic Weisbecker's avatar
    Merge commit 'perf/core' into perf/hw-breakpoint · 0f8f86c7
    Frederic Weisbecker authored
    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.
    0f8f86c7