Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:27 +0000 (12:43 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:27 +0000 (12:43 +0000)
1  2 
include/uapi/sound/snd_sst_tokens.h
sound/soc/intel/boards/kbl_rt5663_max98927.c
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
sound/soc/intel/skylake/skl-messages.c
sound/soc/intel/skylake/skl-nhlt.c
sound/soc/intel/skylake/skl-pcm.c
sound/soc/intel/skylake/skl-sst-utils.c
sound/soc/intel/skylake/skl-topology.c

Simple merge
   */
  #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,
Simple merge