Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:40 +0000 (12:28 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:40 +0000 (12:28 +0000)
1  2 
sound/soc/intel/skylake/skl-nhlt.c

Simple merge