diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-13 00:05:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 00:05:31 +0100 |
commit | deeed33850c8a376addabbf971df433b2a1ba74c (patch) | |
tree | f0c1da260b47d14ba838485b9c4cc042414b78e6 /sound/soc/codecs/cs42l52.c | |
parent | Merge remote-tracking branches 'asoc/topic/wm8961', 'asoc/topic/wm8962', 'aso... (diff) | |
parent | ASoC: wm8996: Replace codec->control_data with wm8996->regmap (diff) | |
parent | ASoC: wm9081: Use SOC_ENUM_SINGLE_DECL() (diff) | |
parent | ASoC: wm9705: Use SOC_ENUM_SINGLE_DECL() (diff) | |
download | linux-deeed33850c8a376addabbf971df433b2a1ba74c.tar.xz linux-deeed33850c8a376addabbf971df433b2a1ba74c.zip |
Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next