diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:57 +0000 |
| commit | a3d91900a69b7fc840a55461c9105762bd4cde87 (patch) | |
| tree | 8877bafe153cd2275ba15f58d08894ce3dc0ae50 | |
| parent | b177e7a5aeb5a9d18cfafbadc1bbca5386f24829 (diff) | |
| parent | a545f5d859c7988ab61850395a4565bfe507dc0a (diff) | |
| parent | 452a256898e7ca88115aa02d3851e67994ce3e19 (diff) | |
Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/doc' into asoc-next