Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip