Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

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

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

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

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