diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 14:12:09 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 14:12:09 +0100 |
commit | 4c908776466b03ab76033373b30f3152b21ef0a8 (patch) | |
tree | 0cc39cb85f28fd45408cf0dcb6ee1ccb27d0d1e6 /sound/soc/samsung/i2s-regs.h | |
parent | Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'aso... (diff) | |
parent | ASoC: rt5645: multiple JD mode support (diff) | |
parent | ASoC: rt5670: add DMIC ASRC support (diff) | |
parent | ASoC: rt5677: make volume TLV closer to reality (diff) | |
parent | ASoC: samsung: Fix non-DT use of I2S controller (diff) | |
parent | ASoC: sgtl5000: Allow 8kHz playback in codec slave mode (diff) | |
download | linux-4c908776466b03ab76033373b30f3152b21ef0a8.tar.xz linux-4c908776466b03ab76033373b30f3152b21ef0a8.zip |
Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next