summaryrefslogtreecommitdiff
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:16 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:16 -0700
commitacf6470ab538402689f01b112d08471cfbb19e8b (patch)
treecf080fab30b544b342000825f1209f26fb120f11 /sound/soc/Makefile
parent7c90fc73bf78aa1f390c65f86a43ffae543a248d (diff)
parent3597fced666469762c8ea64a68f2ce0716776bd8 (diff)
parente094e8f3de9caee07b316324f66696f8a5af4a22 (diff)
parent4d48298af85aff3dcc9498a564e06efeb9c935be (diff)
parentd936d527d241b606b0280034b3972b7825d3704c (diff)
Merge remote-tracking branches 'asoc/topic/cs35l30', 'asoc/topic/cs42l73', 'asoc/topic/cs53l30' and 'asoc/topic/da7213' into asoc-next