Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate...

author Takashi Iwai <tiwai@suse.de>

Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)

committer Takashi Iwai <tiwai@suse.de>

Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
author Takashi Iwai <tiwai@suse.de>
Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
committer Takashi Iwai <tiwai@suse.de>
Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
diff --cc sound/firewire/amdtp.c
Simple merge
diff --cc sound/firewire/speakers.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
		1	2
sound/firewire/amdtp.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/firewire/speakers.c	patch \|	diff1 \|	diff2 \|	blob \| history