Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:04 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:04 +0000 (16:15 +0100)
1  2 
sound/soc/generic/simple-card.c
sound/soc/soc-core.c

Simple merge
Simple merge