Skip to content
Commit 1241eb8f authored by Robert Richter's avatar Robert Richter
Browse files

Merge commit 'tip/perfcounters-for-linus' into oprofile/master 



Conflicts:
	arch/x86/oprofile/op_model_ppro.c

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parents 51563a0e 940010c5
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