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

author Takashi Iwai <[email protected]>

Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)

committer Takashi Iwai <[email protected]>

Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
author Takashi Iwai <[email protected]>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
committer Takashi Iwai <[email protected]>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
diff --cc include/sound/pcm.h
Simple merge
diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/usb/usbaudio.c
Simple merge
author	Takashi Iwai <[email protected]>
	Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
committer	Takashi Iwai <[email protected]>
	Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
		1	2
include/sound/pcm.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbaudio.c	patch \|	diff1 \|	diff2 \|	blob \| history