diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 03:11:56 +0100 |
commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /tools/perf/perf-read-vdso.c | |
parent | Input: convert autorepeat timer to use timer_setup() (diff) | |
parent | Linux 4.14-rc8 (diff) | |
download | linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.zip |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'tools/perf/perf-read-vdso.c')
-rw-r--r-- | tools/perf/perf-read-vdso.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/perf-read-vdso.c b/tools/perf/perf-read-vdso.c index 764e2547c25a..8c0ca0cc428f 100644 --- a/tools/perf/perf-read-vdso.c +++ b/tools/perf/perf-read-vdso.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> #include <string.h> |