Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:30:51 +0000 (21:30 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:30:51 +0000 (21:30 +0000)
commitbd26974f7148d14d432f5c5eb0316e80792b4356
tree41e94166ba82cc941396aeb462dcbd25399fc45f
parentaa38bff80896e3918f357816a79a9b4a1d375c56
parentc42c5ac4269bf8c0aa7ef2f4bdf328a12b03f65f
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
sound/soc/soc-dapm.c