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

[sfrench/cifs-2.6.git] / arch / m32r / platforms / oaks32r / setup.c

diff --git a/arch/m32r/platforms/oaks32r/setup.c b/arch/m32r/platforms/oaks32r/setup.c
index f8373c0695248fc573b22136fc9e2bb2120a0d72..8188c0baa06422ff5c61f16f3bb2db779b71e88d 100644 (file)
--- a/arch/m32r/platforms/oaks32r/setup.c
+++ b/arch/m32r/platforms/oaks32r/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0

 /*
  *  linux/arch/m32r/platforms/oaks32r/setup.c
  *
 /*
  *  linux/arch/m32r/platforms/oaks32r/setup.c
  *