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

diff --cc include/sound/soc-acpi.h
Simple merge

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

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

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

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