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

[sfrench/cifs-2.6.git] / arch / m32r / lib / memset.S

diff --git a/arch/m32r/lib/memset.S b/arch/m32r/lib/memset.S
index 2b2831a379273730c79c026e64bc911d3e456caa..e7f45e6c73f53351f504bb470b5a5fd25be06553 100644 (file)
--- a/arch/m32r/lib/memset.S
+++ b/arch/m32r/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/lib/memset.S
  *