Merge commit 'linux-2.6/master' (early part) into oprofile/core