Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

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

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

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

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

diff --cc sound/soc/intel/skylake/skl-pcm.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge