Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:56:40 +0000 (12:56 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:56:40 +0000 (12:56 +0000)
1  2 
sound/soc/soc-core.c

Simple merge