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

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

diff --cc sound/soc/intel/skylake/bxt-sst.c
Simple merge

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

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