Skip to content
Commit 6268464b authored by Robert Richter's avatar Robert Richter
Browse files

Merge remote branch 'tip/perf/core' into oprofile/core 

Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c
parents 7df01d96 0fdf1360
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment