Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Oct 2014 11:48:52 +0000 (12:48 +0100)
1  2 
include/sound/soc-dapm.h
sound/soc/soc-dapm.c

Simple merge
Simple merge