diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-17 14:25:28 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-17 14:25:28 +0200 |
commit | 7d930ce26e01470590cd003484b32df29529906c (patch) | |
tree | 7fd2b7d0f85f104009ef9edeb32806f6bbc47070 /include/sound/wm8996.h | |
parent | ASoC: core utils: Dont set DMA params for BE substreams (diff) | |
parent | ASoC: add .of_xlate_dai_name on snd_soc_component_driver (diff) | |
download | linux-7d930ce26e01470590cd003484b32df29529906c.tar.xz linux-7d930ce26e01470590cd003484b32df29529906c.zip |
Merge remote-tracking branch 'asoc/topic/component' into asoc-core
Conflicts:
include/sound/soc.h
Diffstat (limited to 'include/sound/wm8996.h')
0 files changed, 0 insertions, 0 deletions