diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:41 +0100 |
| commit | 796ff73a080886330e917baad228c6dffad8003d (patch) | |
| tree | 3e8cb4faeed4167268f033f68188ce4624d06e76 /sound/soc/generic | |
| parent | 7d630ce4d635b847c4c15606738fb0f5aa777cf3 (diff) | |
| parent | 94372fceb2fb5d3d05d6db61c9658865d5e27ee4 (diff) | |
| parent | 3a4e1b93110362f0ca6f81c564b04b2aa4bab853 (diff) | |
| parent | f3f7df7635bd5fb6dbc8de150613d327a3bd6171 (diff) | |
| parent | eae37345c8653a3c797c1763c95289d924ee37a2 (diff) | |
Merge remote-tracking branches 'asoc/topic/hisi', 'asoc/topic/img', 'asoc/topic/jack' and 'asoc/topic/jz4740' into asoc-next