Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/iio', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:59 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:59 +0000 (11:55 +0000)
commit2e015bfb54374cddb40f455fed96bdf84c9bf4ad
tree24e207f4b459a62438aec3912abfd6c10c94521e
parent0e987921bbcf6a46981dce9b9a17cfe265853992
parent769e40f0c17df53bac8999939993a280c1ea3dbd
parent1175d0f9f4031ce02845f6f843f58a9caaee7817
parentb6158323bbe706416f8f13912879a429be5cc2a9
parent866b9c81ad8450eb1e2a0132b4bd9fd909afd647
Merge remote-tracking branches 'asoc/topic/hisilicon', 'asoc/topic/iio', 'asoc/topic/max98373' and 'asoc/topic/max98926' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile