Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:18 +0000 (16:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:18 +0000 (16:32 +0100)

Trivial merge