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

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

diff --git a/arch/metag/lib/memset.S b/arch/metag/lib/memset.S
index 721085bad1d23ecf296fffa5c899230981687c1c..6ee246d831c77477f5a3d558620a56b0d3adab20 100644 (file)
--- a/arch/metag/lib/memset.S
+++ b/arch/metag/lib/memset.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 !   Copyright (C) 2008-2012 Imagination Technologies Ltd.
 
        .text