summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 11:55:59 +0000
committerMark Brown <broonie@kernel.org>2018-01-18 11:55:59 +0000
commit2e015bfb54374cddb40f455fed96bdf84c9bf4ad (patch)
tree24e207f4b459a62438aec3912abfd6c10c94521e /sound/soc
parent0e987921bbcf6a46981dce9b9a17cfe265853992 (diff)
parent769e40f0c17df53bac8999939993a280c1ea3dbd (diff)
parent1175d0f9f4031ce02845f6f843f58a9caaee7817 (diff)
parentb6158323bbe706416f8f13912879a429be5cc2a9 (diff)
parent866b9c81ad8450eb1e2a0132b4bd9fd909afd647 (diff)
Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/iio', 'asoc/topic/max98373' and 'asoc/topic/max98926' into asoc-next