diff options
author | Mark Brown <broonie@kernel.org> | 2018-02-07 11:21:02 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-07 11:21:02 +0000 |
commit | ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f (patch) | |
tree | c36c5e63754c5507e85090d001ec9d0aa79bb246 /sound/soc/codecs/nau8824.h | |
parent | 290df4d3ab192821b66857c05346b23056ee9545 (diff) | |
parent | f30a4c313eb6d5027a85869d1ccf626208218ed0 (diff) | |
parent | 28735af3f59af8388ff5317f1faa3cf532af5dcf (diff) | |
parent | 3a0a7b261009a9eaebd84140e933ee579df18d0c (diff) | |
parent | 276d70f758df143e27ca528cfc6f662fa21f23e1 (diff) | |
download | talos-obmc-linux-ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f.tar.gz talos-obmc-linux-ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f.zip |
Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next