Merge branch 'topic/pcm-delay' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
commiteabaf0634a9034f2e487b0be347edc1460c026a4
treee950df1ba10e0a29b25afdd446ac44988381a851
parent9dea75c70965c240012251dc5845fe0c1a061180
parentae1ec5e1e97f67d41e641a73380129e5905e41cc
Merge branch 'topic/pcm-delay' into for-linus

* topic/pcm-delay:
  ALSA: usbaudio - Add delay account
  ALSA: Add extra delay count in PCM
include/sound/pcm.h
sound/core/pcm_native.c
sound/usb/usbaudio.c