Merge branch 'for-linus' into for-2.6.33