Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:58 +0000 (12:43 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:58 +0000 (12:43 -0700)
1  2 
sound/soc/soc-dapm.c

Simple merge