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

[sfrench/cifs-2.6.git] / arch / m32r / platforms / mappi / io.c

diff --git a/arch/m32r/platforms/mappi/io.c b/arch/m32r/platforms/mappi/io.c
index ac1c396d477de375a271efeaf810c71945d2cc6f..06ea6d9bc576adf3bc00ff73fbad9a1d8b1fc166 100644 (file)
--- a/arch/m32r/platforms/mappi/io.c
+++ b/arch/m32r/platforms/mappi/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi/io.c
  *