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)
commitdc1632321ba1e93dde25870e96cebe21b7d52517
treed52d934c79b23f91654c571d983e1a6ec41b71fd
parent8c193b8dce4f2a2474dc2bc39ec972454df9d439
parenta85f9da707366e856c0aad9e329db0cc59475290
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
MAINTAINERS
sound/soc/soc-core.c
sound/soc/soc-dapm.c