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

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

diff --cc sound/soc/sof/control.c
Simple merge

diff --cc sound/soc/sof/sof-audio.h
Simple merge

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