Merge branch 'linus' into oprofile-v2