Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:35 +0000 (14:19 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:35 +0000 (14:19 +0000)

Trivial merge