Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
authorMark Brown <broonie@linaro.org>
Sun, 30 Jun 2013 11:42:25 +0000 (12:42 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 30 Jun 2013 11:42:25 +0000 (12:42 +0100)

Trivial merge