diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-25 22:22:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-25 22:22:15 +0100 |
commit | c159a85013afbb8283f0c7272812952e04d5c3a1 (patch) | |
tree | 06e05c4c121abce92f5759eaa7d9baa87a25d496 /sound/soc/sirf/sirf-audio-port.c | |
parent | Merge remote-tracking branch 'asoc/topic/simple' into asoc-next (diff) | |
parent | ASoC: imx-ssi: Add .xlate_tdm_slot_mask() support. (diff) | |
parent | ASoC: tegra: move AC97 clock handling to the machine driver (diff) | |
download | linux-c159a85013afbb8283f0c7272812952e04d5c3a1.tar.xz linux-c159a85013afbb8283f0c7272812952e04d5c3a1.zip |
Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next