Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 2 Sep 2014 22:33:38 +0000 (23:33 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 2 Sep 2014 22:33:38 +0000 (23:33 +0100)

Trivial merge