diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-21 17:46:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-21 17:46:17 +0100 |
| commit | 0cdbde31977cc898cfe46f3b825d3256119ae206 (patch) | |
| tree | 11e17f788be59b7c92d90cf0e1f2f2ddfdd1cd0e /sound | |
| parent | e403be505ccb35c58a7a8bd5f57ca66d46e3d5f1 (diff) | |
| parent | 9d154e42a338a4142e7a656d662ebf98c4ceb26b (diff) | |
| parent | 364e93ca5dd6f4d266c3a5ff169961d2caac19fb (diff) | |
Merge remote-tracking branches 'asoc/fix/samsung' and 'asoc/fix/sgtl5000' into asoc-linus