diff options
| author | Mark Brown <broonie@kernel.org> | 2017-05-29 15:03:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-29 15:03:22 +0100 |
| commit | be29963c9e677cb1a3331d6d2d0854a34e2f8d97 (patch) | |
| tree | f31b1292a73944ba17c6f6560766d3f41505827f /sound | |
| parent | 4323d165a6ea0297b20f2e5b10a34de0280425c4 (diff) | |
| parent | 9f3b777f1de9ff5d17f7259b8f7da5e9d4303e87 (diff) | |
| parent | fa1014302791a1e436387e93a90f38717d7f9b03 (diff) | |
Merge remote-tracking branches 'asoc/topic/msm8916' and 'asoc/topic/nau8824' into asoc-next