Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@linaro.org>
Tue, 29 Apr 2014 16:49:49 +0000 (09:49 -0700)
committerMark Brown <broonie@linaro.org>
Tue, 29 Apr 2014 16:49:49 +0000 (09:49 -0700)
1  2 
sound/soc/soc-dapm.c

Simple merge