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

[linux.git] / include / linux / spinlock.h

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 4e202b00dd66f925975ea938ad5343debd17ce77..a39186194cd6782ac0b6705f02af6179a86f7813 100644 (file)
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPINLOCK_H
 #define __LINUX_SPINLOCK_H