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

[sfrench/cifs-2.6.git] / tools / include / asm-generic / bitops / atomic.h

diff --git a/tools/include/asm-generic/bitops/atomic.h b/tools/include/asm-generic/bitops/atomic.h
index 68b8c1516c5a719b9fd422849e4431bafdaf8065..21c41ccd126667123617e67bcf7148bd02710618 100644 (file)
--- a/tools/include/asm-generic/bitops/atomic.h
+++ b/tools/include/asm-generic/bitops/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_
 #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_