Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@kernel.org>
Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge