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

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

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

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