Merge branch 'for-linus' into for-next

Merge pending fixes that haven't pulled into 3.8.