Merge remote-tracking branches 'asoc/fix/adau1701' and 'asoc/fix/tlv320aic32x4' into...
authorMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:51 +0000 (12:42 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:51 +0000 (12:42 +0000)

Trivial merge