Merge branch 'topic/pcm-delay' into for-linus
Takashi Iwai [Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)]
* topic/pcm-delay:
  ALSA: usbaudio - Add delay account
  ALSA: Add extra delay count in PCM

1  2 
include/sound/pcm.h
sound/core/pcm_native.c
sound/usb/usbaudio.c

Simple merge
Simple merge
Simple merge