Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
commit9805fe391d918d5127530ca7741904407d28f428
tree3f744f9fc4a7fea5e5ca8e2e0558723828e3b1d3
parent70fe99d8dbbcff8b61b613e738e9d133ed2d2b15
parent656ca9d327a3dbac6db28c5bf80f5bc86f7f8548
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-dapm.c