Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:27 +0000 (13:37 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:27 +0000 (13:37 +0100)

Trivial merge