aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/link-vmlinux.sh
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-07 18:11:56 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-07 18:11:56 -0800
commit0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch)
treef0aa64e956d1d2addb2263ddcd238e9f014b36a0 /scripts/link-vmlinux.sh
parentInput: convert autorepeat timer to use timer_setup() (diff)
parentLinux 4.14-rc8 (diff)
downloadlinux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.gz
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 'scripts/link-vmlinux.sh')
-rwxr-xr-xscripts/link-vmlinux.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index e7b7eee31538..e6818b8e7141 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
#
# link vmlinux
#