Merge branch 'oprofile/perf' into oprofile/core