Merge branch 'for-2.6.34-rc1-batch2' into for-linus