Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:01 +0000 (15:10 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:01 +0000 (15:10 +0800)
1  2 
sound/soc/soc-dapm.c

Simple merge