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

[sfrench/cifs-2.6.git] / arch / metag / Kconfig

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 7d8b322e5101d7bd00835be59db1d494be164ad8..c7b62a3395390e38765956f8cd3b119e82be41c5 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config METAG
        def_bool y
        select EMBEDDED