Skip to content
Commit 0361e023 authored by Robert Richter's avatar Robert Richter
Browse files

Merge branch 'oprofile/perf' into oprofile/core 



Conflicts:
	arch/arm/oprofile/common.c

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parents 4fdaa7b6 e9677b3c
Hide whitespace changes
Inline Side-by-side
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