Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:07:19 +0000 (22:07 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:07:19 +0000 (22:07 +0100)

Trivial merge