Merge branch 'for-2.6.34-next' into for-2.6.34