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

diff --cc sound/soc/intel/atom/sst/sst_acpi.c
Simple merge

diff --cc sound/soc/intel/common/sst-acpi.c
Simple merge

diff --cc sound/soc/intel/common/sst-dsp.h
Simple merge

diff --cc sound/soc/intel/common/sst-firmware.c
Simple merge