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

diff --cc sound/soc/intel/boards/bytcht_es8316.c
Simple merge

diff --cc sound/soc/intel/boards/cml_rt1011_rt5682.c
Simple merge

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