diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:48:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:48:05 +0100 |
commit | 783711f0d2458ca1bd716000e767c478cef27144 (patch) | |
tree | 0aebe2cfc09cbfa9a18e6a5e8d002489745f45a8 /tools/perf/builtin-version.c | |
parent | objtool: Print top level commands on incorrect usage (diff) | |
parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-783711f0d2458ca1bd716000e767c478cef27144.tar.xz linux-783711f0d2458ca1bd716000e767c478cef27144.zip |
Merge branch 'linus' into core/objtool, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-version.c')
-rw-r--r-- | tools/perf/builtin-version.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c index d25149456a2f..37019c5d675f 100644 --- a/tools/perf/builtin-version.c +++ b/tools/perf/builtin-version.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "builtin.h" #include "perf.h" #include <linux/compiler.h> |