Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
Mark Brown [Mon, 10 Jun 2013 09:28:50 +0000 (10:28 +0100)]

Trivial merge