]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 19 Dec 2013 20:40:52 +0000 (20:40 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 19 Dec 2013 20:40:52 +0000 (20:40 +0000)

Trivial merge