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

[sfrench/cifs-2.6.git] / arch / metag / include / asm / thread_info.h

diff --git a/arch/metag/include/asm/thread_info.h b/arch/metag/include/asm/thread_info.h
index 32677cc278aa16d310b84bfda09a6bc317ba4115..554f73a77e6e38229264d0f5a5b7aa013aeb77f7 100644 (file)
--- a/arch/metag/include/asm/thread_info.h
+++ b/arch/metag/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 /* thread_info.h: Meta low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
 /* thread_info.h: Meta low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)