Merge commit 'v2.6.34-rc5' into oprofile/core