Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 18:05:17 +0000 (19:05 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 18:05:17 +0000 (19:05 +0100)

Trivial merge