Merge branch 'x86/oprofile' into oprofile