Merge remote-tracking branches 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/tlv32...
authorMark Brown <broonie@linaro.org>
Tue, 8 Apr 2014 20:22:14 +0000 (21:22 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 8 Apr 2014 20:22:14 +0000 (21:22 +0100)

Trivial merge