Merge remote-tracking branches 'asoc/fix/da732x' and 'asoc/fix/sta32x' into asoc...
authorMark Brown <broonie@linaro.org>
Thu, 27 Feb 2014 11:26:08 +0000 (20:26 +0900)
committerMark Brown <broonie@linaro.org>
Thu, 27 Feb 2014 11:26:08 +0000 (20:26 +0900)

Trivial merge