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

[sfrench/cifs-2.6.git] / arch / metag / kernel / head.S

diff --git a/arch/metag/kernel/head.S b/arch/metag/kernel/head.S
index 713f71d1bdfe209c66c6be7adc93a07a912dbf39..3ed27813413e09609ed525a0170c50dadfe4c42f 100644 (file)
--- a/arch/metag/kernel/head.S
+++ b/arch/metag/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
        ! Copyright 2005,2006,2007,2009 Imagination Technologies
 
 #include <linux/init.h>