Merge remote-tracking branch 'asoc/topic/core' into tmp
authorMark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
1  2 
MAINTAINERS
sound/soc/soc-core.c

diff --cc MAINTAINERS
Simple merge
Simple merge