]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Merge up fixes
authorMark Brown <broonie@kernel.org>
Wed, 5 Mar 2025 19:10:50 +0000 (19:10 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 5 Mar 2025 19:10:50 +0000 (19:10 +0000)
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.

12 files changed:
1  2 
MAINTAINERS
arch/x86/entry/common.c
sound/hda/intel-dsp-config.c
sound/pci/hda/tas2781_hda_spi.c
sound/soc/codecs/arizona.c
sound/soc/codecs/madera.c
sound/soc/codecs/tas2764.c
sound/soc/sof/amd/acp.c
sound/soc/sof/amd/acp.h
sound/soc/sof/amd/pci-vangogh.c
sound/soc/sof/ipc4-topology.c
sound/soc/sof/pcm.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge