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

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

diff --git a/arch/metag/Kconfig.soc b/arch/metag/Kconfig.soc
index 50f979c2b02d912b8530d869b293da0cb530ca73..c521f0e00d8ef44b1b78e0cb75598db9a7052bf7 100644 (file)
--- a/arch/metag/Kconfig.soc
+++ b/arch/metag/Kconfig.soc
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
        prompt "SoC Type"
        default META21_FPGA