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

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

diff --git a/tools/include/asm-generic/bitops.h b/tools/include/asm-generic/bitops.h
index 0304600121daa90b3b4ac3621dec03ba94f252d0..9bce3b56b5e74c25541749c9a916be0c70747c3b 100644 (file)
--- a/tools/include/asm-generic/bitops.h
+++ b/tools/include/asm-generic/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_ASM_GENERIC_BITOPS_H
 #define __TOOLS_ASM_GENERIC_BITOPS_H