Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:37 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:37 +0000 (11:55 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge