diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:37 +0000 |
| commit | 1e570a83ad90f1e47540acd11cf1fac9da120815 (patch) | |
| tree | a5d84f1f91480d0c1d209fb74fc46d7286c24dcd /sound/parisc | |
| parent | 2e8239e792ba9c86310e76e98017a11dc2173969 (diff) | |
| parent | 86834511c2acd23e214d5739e9ea58e31b975d1f (diff) | |
| parent | 3b89e4b77ef9c2f985964fab17032db98f074ed0 (diff) | |
Merge remote-tracking branches 'asoc/fix/da7219-pops' and 'asoc/fix/qcom' into asoc-linus