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

[sfrench/cifs-2.6.git] / arch / metag / lib / Makefile

diff --git a/arch/metag/lib/Makefile b/arch/metag/lib/Makefile
index a41d24e270e6acff2831a70eb265cb14e44f4a10..3982850d692cd00662c52280746c7cd6a23f0737 100644 (file)
--- a/arch/metag/lib/Makefile
+++ b/arch/metag/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Meta-specific library files.
 #