Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate...
authorTakashi Iwai <tiwai@suse.de>
Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Oct 2013 08:02:57 +0000 (10:02 +0200)
commit861e66d3418a90f57b31a50110fc70b23569c551
treeffa0d5bf8dc3e4b82b88d8942390a11d827423f9
parentb55447a7301b12d509df4b2909ed38d125ad83d4
parentb20be8de1b3972ccf9af72850b045214faa8d830
Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate into for-next
sound/firewire/amdtp.c
sound/firewire/speakers.c