diff options
author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
commit | 7b47c66cfa203288c43851260edeeb0fae56f692 (patch) | |
tree | fa729735fdaf1d77fbbf13062fd53c31b59d682d /tools/perf/scripts/python/stat-cpi.py | |
parent | ca0e68e21aae10220eff71a297e7d794425add77 (diff) | |
parent | ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff) |
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.
Effectively this also pulls 4.15-r2 into drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'tools/perf/scripts/python/stat-cpi.py')
-rw-r--r-- | tools/perf/scripts/python/stat-cpi.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/scripts/python/stat-cpi.py b/tools/perf/scripts/python/stat-cpi.py index 8b60f343dd07c..8410672efb8b5 100644 --- a/tools/perf/scripts/python/stat-cpi.py +++ b/tools/perf/scripts/python/stat-cpi.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# SPDX-License-Identifier: GPL-2.0 data = {} times = [] |