Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 28 Jun 2013 11:17:06 +0000 (12:17 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 28 Jun 2013 11:17:06 +0000 (12:17 +0100)

Trivial merge