Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	sound/soc/intel/sst/sst_acpi.c

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

diff --cc sound/soc/intel/bytcr_dpcm_rt5640.c
Simple merge

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

diff --cc sound/soc/intel/sst-haswell-ipc.c
Simple merge