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

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

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

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

diff --cc sound/soc/meson/g12a-tohdmitx.c
Simple merge

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

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

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

diff --cc sound/soc/sunxi/sun8i-codec.c
Simple merge