Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
commit3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45
tree98554d8d3f74c7444871d9461d3c1a46c23ce158
parent6b8bd8b2d7937fc633725c252c3a9ed9fff47098
parent20bb0184f24df64d1ed4fa07c8feeeffda9b7721
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-dapm.c