diff options
author | Mark Brown <broonie@kernel.org> | 2016-07-24 23:07:48 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-07-24 23:07:48 +0200 |
commit | e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5 (patch) | |
tree | 62d92076c83cac9cd45d49f8ccd4a9a4784fa23a /sound/Makefile | |
parent | Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31x... (diff) | |
parent | ASoC: wm8753: Replace magic number (diff) | |
parent | ASoC fix up SND_SOC_WM8985 dependency (diff) | |
download | linux-e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5.tar.xz linux-e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5.zip |
Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next