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

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

diff --git a/arch/metag/tbx/Makefile b/arch/metag/tbx/Makefile
index e994239e518c4f1916255b2382d65ae9abdaa3d2..98bc5453cf24549e85767f40317a3b5f7e73fdee 100644 (file)
--- a/arch/metag/tbx/Makefile
+++ b/arch/metag/tbx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for TBX library files..
 #