Merge branch 'asoc-5.3' into asoc-linus

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

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

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

diff --cc sound/soc/sof/intel/hda.c
Simple merge