Merge branch 'master' into followname

Conflicts:

	inotail.c

1 files changed, 0 insertions, 4 deletions

diff --git a/README b/README
index 577584e..a4a200a 100644
--- a/README
+++ b/README
@@ -39,8 +39,4 @@ inotail is licensed under the terms of the GNU General Public License version 2
 or later. You can find the full text in the file LICENSE in the source tree of
 inotail.
 
-The files inotify.h and inotify-syscalls.h were taken from the source tree of
-the Linux kernel and slightly altered. Both are licensed under the terms of the
-GNU General Public License version 2.
-
 -- Tobias Klauser <tklauser@distanz.ch>