diff options
| author | Mark Brown | 2017-07-03 16:15:11 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-07-03 16:15:11 +0100 |
| commit | 5e9516db5fbc9b8e6a60e5f201129ab4de1571f1 (patch) | |
| tree | b6b23192454ed36cf7b3b914ee918e6711e6d23c | |
| parent | be6054765c14333557ade067de5280177ac92a42 (diff) | |
| parent | 372f69a01be178b896ebb8ef7021e0b165084b25 (diff) | |
| parent | ca3b5ad30c0b32f8d12ddb307b698ff56d56c2aa (diff) | |
| parent | 2a54e845f6e5069666e1749bd952abdc0413910d (diff) | |
| parent | 1943b0661184a5d17f31624dc8ac2c02a086c998 (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/hisi' and 'asoc/topic/max9867' into asoc-next