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

diff --cc include/uapi/sound/snd_sst_tokens.h
Simple merge

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

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

diff --cc sound/soc/intel/skylake/skl-nhlt.c
index bde7f40f29f5c61da3c2794d10a5ace90f69a03a,1ce414d86d8a422969719aa755692a8c20ca11b4..d9b3dc89a1dc49cefbe7d5d89907b72c261a9ba9
--- 1/sound/soc/intel/skylake/skl-nhlt.c
--- 2/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@@ -19,8 -19,9 +19,10 @@@
   */
  #include <linux/pci.h>
  #include "skl.h"
 +#include "skl-i2s.h"
  
+ #define NHLT_ACPI_HEADER_SIG  "NHLT"
+ 
  /* Unique identification for getting NHLT blobs */
  static guid_t osc_guid =
        GUID_INIT(0xA69F886E, 0x6CEB, 0x4594,

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

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

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