From: Takashi Iwai Date: Wed, 10 Jun 2009 05:26:40 +0000 (+0200) Subject: Merge branch 'topic/pcm-delay' into for-linus X-Git-Tag: v2.6.31-rc1~363^2~14 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=eabaf0634a9034f2e487b0be347edc1460c026a4 Merge branch 'topic/pcm-delay' into for-linus * topic/pcm-delay: ALSA: usbaudio - Add delay account ALSA: Add extra delay count in PCM --- eabaf0634a9034f2e487b0be347edc1460c026a4