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