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)
1  2 
include/sound/soc-dapm.h
sound/soc/soc-dapm.c

Simple merge
Simple merge