Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:52 +0000 (15:51 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:52 +0000 (15:51 +0100)
1  2 
sound/soc/soc-core.c
sound/soc/soc-dapm.c

Simple merge
Simple merge