Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / arch / m32r / kernel / vmlinux.lds.S

diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index ad1fe56455aae60b05b9e1a30294ccd2ab7b48ab..7e4d957f7f7f00c62a2facbc1ad1f155d6d1f9ca 100644 (file)
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make M32R Linux kernel
  */