Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 29 Mar 2017 11:55:05 +0000 (12:55 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 29 Mar 2017 11:55:05 +0000 (12:55 +0100)

Trivial merge