diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-11 14:54:32 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-11 14:54:32 +0100 |
commit | 188bdf726877fb27530934baea90876dfc2012ba (patch) | |
tree | 582a51593c3cfcfd0382bb2b654abd08c90ebb3e /sound/soc/codecs/wm5110.c | |
parent | Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next (diff) | |
parent | ASoC: wm_adsp: Pull data through compressed read (diff) | |
parent | ASoC: AMD: Add missing include file (diff) | |
download | linux-188bdf726877fb27530934baea90876dfc2012ba.tar.xz linux-188bdf726877fb27530934baea90876dfc2012ba.zip |
Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next