linux-stable/sound/firewire
Takashi Iwai 9d0af44c2e Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2020-01-20 11:44:51 +01:00
..
bebob ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
dice Merge branch 'for-linus' into for-next 2020-01-20 11:44:51 +01:00
digi00x ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
fireface ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
fireworks ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
motu ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
oxfw ALSA: oxfw: fix for Stanton SCS.1d 2020-01-13 10:42:27 +01:00
tascam Merge branch 'for-linus' into for-next 2020-01-20 11:44:51 +01:00
amdtp-am824.c ALSA: firewire-lib: process payload of isoc context according to packet descriptors 2019-07-22 16:05:11 +02:00
amdtp-am824.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
amdtp-stream-trace.h ALSA: firewire-lib: pass data block count as an argument to tracepoints event 2019-07-22 16:04:56 +02:00
amdtp-stream.c ALSA: firewire-lib: postpone to start IR context 2019-10-19 09:18:27 +02:00
amdtp-stream.h ALSA: firewire-lib: postpone to start IR context 2019-10-19 09:18:27 +02:00
cmp.c ASoC: Updates for v5.3 2019-07-08 14:45:34 +02:00
cmp.h ALSA: firewire-lib: split allocation of isochronous resources from establishment of connection 2019-06-17 08:18:36 +02:00
fcp.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
fcp.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
isight.c ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
iso-resources.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
iso-resources.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig sound: Fix Kconfig indentation 2019-10-07 03:53:03 +02:00
lib.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
lib.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
packets-buffer.c ALSA: firewire: fix a memory leak bug 2019-08-08 11:12:26 +02:00
packets-buffer.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00