diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-03 11:40:00 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-03 11:40:00 +0200 |
commit | a2fbbbf10d7a11a949c32625e7088ad46f3c4bbc (patch) | |
tree | d3fc75f7e4bf983ce7a45dc283dfab1ffaa11142 | |
parent | Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next (diff) | |
parent | ASoC: wm8804: Allow control of master clock divider in PLL generation (diff) | |
parent | ASoC: wm9713: correct mono out PGA sources (diff) | |
download | linux-a2fbbbf10d7a11a949c32625e7088ad46f3c4bbc.tar.xz linux-a2fbbbf10d7a11a949c32625e7088ad46f3c4bbc.zip |
Merge remote-tracking branches 'asoc/topic/wm8804' and 'asoc/topic/wm9713' into asoc-next