Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:07 +0000 (19:17 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:07 +0000 (19:17 +0100)

Trivial merge