Merge branch 'oprofile/core' into oprofile/x86