diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
commit | 1420edf7a3fbc9b8b0bbe24c3724d582dd4def28 (patch) | |
tree | 919f3adb874b11cb5e4ed2df37a9370847300ea4 /tools/perf/scripts/python/event_analyzing_sample.py | |
parent | 517f56839f581618d24f2e67a35738a5c6cbaecb (diff) | |
parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) |
Merge tag 'v4.15-rc1' into drm-misc-fixes
Linux 4.15-rc1
Pull in the merge window to resync. Dave didn't get his -fixes pull
landed in time, and now there's another rockchip fix pending, so
fast-forwarding isn't possible, hence backmerge.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
-rw-r--r-- | tools/perf/scripts/python/event_analyzing_sample.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/scripts/python/event_analyzing_sample.py b/tools/perf/scripts/python/event_analyzing_sample.py index 163c39fa12d9..4e843b9864ec 100644 --- a/tools/perf/scripts/python/event_analyzing_sample.py +++ b/tools/perf/scripts/python/event_analyzing_sample.py @@ -1,4 +1,5 @@ # event_analyzing_sample.py: general event handler in python +# SPDX-License-Identifier: GPL-2.0 # # Current perf report is already very powerful with the annotation integrated, # and this script is not trying to be as powerful as perf report, but |