Merge branch 'oprofile/urgent' into HEAD