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

diff --cc MAINTAINERS
Simple merge

diff --cc include/sound/soc.h
Simple merge

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

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

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

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

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

diff --cc sound/soc/intel/skylake/skl.c
Simple merge

diff --cc sound/soc/omap/omap-mcbsp.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/q6afe-dai.c
Simple merge

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

diff --cc sound/soc/sh/rcar/dvc.c
Simple merge

diff --cc sound/soc/sh/rcar/ssi.c
Simple merge

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