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

[linux-2.6-block.git] / fs / readdir.c

diff --git a/fs/readdir.c b/fs/readdir.c
index 7c584bbb4ce3ccf4252a4c572478ab5e5c735a11..1b83b0ad183b656b06597dc65ab7d42883cc116e 100644 (file)
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/readdir.c
  *