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

[sfrench/cifs-2.6.git] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index 21eedd0dd81a12e43c541ec93f86b740b1f710c1..d15c0ee4d95504a88337498045a84f53a6ae0d15 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/kernel/acct.c
  *