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

[sfrench/cifs-2.6.git] / arch / blackfin / mach-bf533 / Kconfig

diff --git a/arch/blackfin/mach-bf533/Kconfig b/arch/blackfin/mach-bf533/Kconfig
index 4c572443147e62d0f32b81ca0cc9d1297ccb2625..4e1a05be71378ee4126ebb570daefebf50dbb49a 100644 (file)
--- a/arch/blackfin/mach-bf533/Kconfig
+++ b/arch/blackfin/mach-bf533/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if (BF533 || BF532 || BF531)
 
 source "arch/blackfin/mach-bf533/boards/Kconfig"