diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-12 20:09:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-12 20:09:20 +0100 |
| commit | 8e01a12386a277ee535dfbfda3b9e13cdcb22bf7 (patch) | |
| tree | d2f11f4af1470763f4d24ce2e6c67d3be36be303 | |
| parent | 31b653de3915e0322affb224fc67e376f1281e3a (diff) | |
| parent | 408ef7e18097810f160629447e6ebe979a0b4282 (diff) | |
| parent | 22e766146a5ae744b0e95d80f663a9aab9c189fb (diff) | |
| parent | ec103964776bf8af74e66eb1a810eada757718a5 (diff) | |
| parent | 519302954b726612eea6362047660cd56aa15c2e (diff) | |
Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/mtk', 'asoc/topic/nau8810' and 'asoc/topic/of-bool' into asoc-next