ASoC: Merge up fixes

Merge branch 'for-6.11' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.12 for some AMD work.

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/sof/amd/acp.c
Simple merge

diff --cc sound/soc/sof/amd/acp.h
Simple merge

diff --cc sound/soc/sof/amd/pci-acp63.c
Simple merge