diff options
| author | Mark Brown <broonie@kernel.org> | 2017-05-29 15:03:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-29 15:03:09 +0100 |
| commit | fff31596211fe9d2e2d8f7f337bd64e7ac2b8111 (patch) | |
| tree | f2ff151603aaf7c4ec888f1c8fa3fd65937de767 /sound | |
| parent | 3ef601cebdb684acf68c5bf594d523002784a0b6 (diff) | |
| parent | fe0dfd6358a17c79bd7d6996af7512ba452a7059 (diff) | |
| parent | 6a9a440681f2170b9a07b1cf28c6aa7532c307c8 (diff) | |
Merge remote-tracking branches 'asoc/fix/rt286' and 'asoc/fix/zte' into asoc-linus