Skip to content
Commit 4cafc4b8 authored by Robert Richter's avatar Robert Richter
Browse files

Merge branch 'oprofile/core' into oprofile/x86 



Conflicts:
	arch/x86/oprofile/op_model_amd.c

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parents b47fad3b dbd1e66e
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