Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 1 Jul 2016 16:05:30 +0000 (18:05 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 1 Jul 2016 16:05:30 +0000 (18:05 +0200)

Trivial merge