Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:44 +0000 (12:43 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:44 +0000 (12:43 -0700)

Trivial merge