Merge commit 'v2.6.34-rc1' into for-linus