Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
authorMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 10:46:56 +0000 (11:46 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 10:46:56 +0000 (11:46 +0100)

Trivial merge