diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:59 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:59 +0100 |
commit | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (patch) | |
tree | d3f77e535d58ef84c2e3c4aee8d20266b9c6ba94 /sound/soc/sh/rcar/rsnd.h | |
parent | Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next (diff) | |
parent | ASoC: simple-card: overwrite cpu_dai->fmt with codec_dai->fmt (diff) | |
parent | ASoC: sirf-audio-codec: Remove snd_soc_codec_set_cache_io() call (diff) | |
download | linux-e090d5b6ad20056ec0ef58727e3ae95fd82be090.tar.xz linux-e090d5b6ad20056ec0ef58727e3ae95fd82be090.zip |
Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next