Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:17:14 +0000 (14:17 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:17:14 +0000 (14:17 +0100)

Trivial merge