diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-13 00:04:35 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 00:04:35 +0100 |
commit | a4b12990b68079290ab62799035afe175b4bdc23 (patch) | |
tree | ace02d498d6c7d98178ae4d6a15b0e53dfdbee93 /sound/soc/intel/sst-acpi.c | |
parent | Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'aso... (diff) | |
parent | ASoC: ml26124: Use SOC_ENUM_SINGLE_DECL() (diff) | |
parent | ASoC: core: add TDM slot parsing from DT supports (diff) | |
parent | ASoC: omap: Use SOC_ENUM_SINGLE_EXT_DECL() (diff) | |
parent | ASoC: pxa: zylonite: Convert to table based DAPM setup (diff) | |
parent | ASoC: rsnd: rename scu to src (diff) | |
download | linux-a4b12990b68079290ab62799035afe175b4bdc23.tar.xz linux-a4b12990b68079290ab62799035afe175b4bdc23.zip |
Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next