Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
authorMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
1  2 
MAINTAINERS
sound/soc/soc-core.c
sound/soc/soc-dapm.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge