Merge branch 'topic/pcm-cleanup' into for-linus