Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 5 Jan 2016 23:07:33 +0000 (23:07 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jan 2016 23:07:33 +0000 (23:07 +0000)

Trivial merge