Merge branch 'for-linus' into for-3.2/core