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