Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge