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)
commit85ee1f42fa60693e5ed72e9453ef6352e72bb4c0
treec3c524bd6316c4c70b4f93291683ee6fff95eda4
parent51fa6a8f15ddaaf8ecb0fe75b365c012905341fe
parent8288591368fcb470024348a9b846f7b3f791be44
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
sound/soc/generic/simple-card.c
sound/soc/soc-core.c