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

* topic/pcm-delay:
  ALSA: usbaudio - Add delay account
  ALSA: Add extra delay count in PCM