Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 11:50:40 +0000 (11:50 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 11:50:40 +0000 (11:50 +0000)

Trivial merge