linux/sound/firewire/dice
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
..
Makefile ASoC: Updates for v5.3 2019-07-08 14:45:34 +02:00
dice-alesis.c ALSA: dice: add support for Alesis MasterControl 2020-01-13 10:44:30 +01:00
dice-extension.c ALSA: dice: fix fallback from protocol extension into limited functionality 2020-01-13 10:43:27 +01:00
dice-hwdep.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
dice-interface.h ALSA: dice: improve support for ancient firmware for DICE 2018-04-24 17:18:59 +02:00
dice-midi.c ALSA: dice: share PCM buffer size for both direction 2019-10-18 04:35:47 +02:00
dice-mytek.c ALSA: dice: add stream format parameters for Mytek devices 2018-05-18 08:53:51 +02:00
dice-pcm.c ALSA: firewire: Drop superfluous ioctl PCM ops 2019-12-11 07:25:27 +01:00
dice-presonus.c ALSA: dice: add stream format parameters for PreSonus FireStudio 2019-05-20 07:46:43 +02:00
dice-proc.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
dice-stream.c ALSA: dice: loosen stream format check for MIDI conformant data channel 2020-01-13 10:44:00 +01:00
dice-tcelectronic.c ALSA: dice: unuse second stream for MIDI conformant data channel for TC Electronic models 2018-05-27 08:32:08 +02:00
dice-transaction.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 345 2019-06-05 17:37:08 +02:00
dice.c ALSA: dice: add support for Alesis MasterControl 2020-01-13 10:44:30 +01:00
dice.h ALSA: dice: add support for Alesis MasterControl 2020-01-13 10:44:30 +01:00