Merge remote-tracking branches 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix...
authorMark Brown <broonie@linaro.org>
Thu, 17 Jul 2014 20:45:47 +0000 (21:45 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Jul 2014 20:45:47 +0000 (21:45 +0100)

Trivial merge