aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire/dice/dice-alesis.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-09-16 07:19:22 +0200
committerTakashi Iwai <tiwai@suse.de>2019-09-16 07:19:22 +0200
commit9bf9bf5440b99edfba496388c90b52ebcd9df715 (patch)
tree2ed6c23e9d174a15d7950e970cb6f3481dd8fcdc /sound/firewire/dice/dice-alesis.c
parentMerge branch 'for-next' into for-linus (diff)
parentMerge branch 'asoc-5.4' into asoc-next (diff)
downloadlinux-dev-9bf9bf5440b99edfba496388c90b52ebcd9df715.tar.xz
linux-dev-9bf9bf5440b99edfba496388c90b52ebcd9df715.zip
Merge tag 'asoc-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final merge window fixes for v5.4 A few small fixes and one feature that came in since I sent you the earlier pull request.
Diffstat (limited to 'sound/firewire/dice/dice-alesis.c')
0 files changed, 0 insertions, 0 deletions