Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core