Merge branch 'oprofile/urgent' (early part) into oprofile/perf