Merge branch 'asoc-5.3' into asoc-5.4

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/rt1308.c
index 6f2ee6809dbbd7ffa8547c667dfb6590ff94f5ea,d673506c7c3944fd8bb354555d476c72d6d706b9..6f2ee6809dbbd7ffa8547c667dfb6590ff94f5ea
mode 100755,100644..100644
--- 1/sound/soc/codecs/rt1308.c
--- 2/sound/soc/codecs/rt1308.c
+++ b/sound/soc/codecs/rt1308.c

diff --cc sound/soc/codecs/rt1308.h
index ff7c423e879e42430ff3d0f7d2a3dcc100fc9826,c330aae1d5274d30c7990a277cc92bc0b95ed29e..ff7c423e879e42430ff3d0f7d2a3dcc100fc9826
mode 100755,100644..100644
--- 1/sound/soc/codecs/rt1308.h
--- 2/sound/soc/codecs/rt1308.h
+++ b/sound/soc/codecs/rt1308.h

diff --cc sound/soc/generic/audio-graph-card.c
Simple merge

diff --cc sound/soc/rockchip/rockchip_max98090.c
Simple merge

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

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

diff --cc sound/soc/ti/davinci-mcasp.c
Simple merge