Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:25 +0000 (15:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:25 +0000 (15:05 +0100)
1  2 
include/sound/soc-dapm.h
sound/soc/soc-core.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge