diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-26 15:26:39 +0000 |
| commit | b872617c09843ee6a9dba7818b56f96232dfe62d (patch) | |
| tree | 9465f9da17790cd5827d5367aad941151a2c2fac /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 52fe54ef3fe25ae7d8bce738a6558eab8383e19d (diff) | |
| parent | 290df4d3ab192821b66857c05346b23056ee9545 (diff) | |
| parent | dd6bb9b16f23f9b95b77713c45bd6182336c5b2e (diff) | |
Merge remote-tracking branches 'asoc/fix/compress' and 'asoc/fix/mtk' into asoc-linus