Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)

Trivial merge