Merge branch 'asoc-5.0' into asoc-5.1 for dapm table

diff --cc MAINTAINERS
Simple merge

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

diff --cc sound/soc/sh/rcar/core.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/soc-topology.c
Simple merge