Hi Mark,
Today's linux-next merge of the regmap tree got conflicts in:
sound/soc/codecs/da7210.c
sound/soc/codecs/rt5651.c
sound/soc/codecs/wm8993.c
between commit:
c418a84a8c8f ("ASoC: Constify reg_default tables")
from the sound-asoc tree and commit:
8019ff6cfc04 ("regmap: Use
Hi Mark,
Today's linux-next merge of the regmap tree got conflicts in:
sound/soc/codecs/da7210.c
sound/soc/codecs/rt5651.c
sound/soc/codecs/wm8993.c
between commit:
c418a84a8c8f (ASoC: Constify reg_default tables)
from the sound-asoc tree and commit:
8019ff6cfc04 (regmap: Use
2 matches
Mail list logo