Merge branch 'topic/pcm-jiffies-check' into for-linus