Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/codecs/cs35l32.c
Simple merge

diff --cc sound/soc/codecs/cs35l33.c
Simple merge

diff --cc sound/soc/codecs/cs35l34.c
Simple merge

diff --cc sound/soc/codecs/cs42l42.c
Simple merge

diff --cc sound/soc/codecs/cs42l73.c
Simple merge

diff --cc sound/soc/codecs/cs53l30.c
Simple merge

diff --cc sound/soc/codecs/lpass-rx-macro.c
Simple merge

diff --cc sound/soc/codecs/lpass-tx-macro.c
Simple merge

diff --cc sound/soc/fsl/Kconfig
Simple merge

diff --cc sound/soc/intel/boards/bytcr_rt5640.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge