Merge branch 'cleanup' into for-linus