diff --git a/[refs] b/[refs] index 28134c715b07..f327ae2951cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f3f259fa8f1d7969360acfad5307d03c2f53d63 +refs/heads/master: 88b2dbdbed551e4e21fdc8c56a15e198c52274e2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 433f35385756..271fadbf9d1c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2286,6 +2286,12 @@ S: Maintained F: Documentation/hwmon/f71805f F: drivers/hwmon/f71805f.c +FANOTIFY +M: Eric Paris +S: Maintained +F: fs/notify/fanotify/ +F: include/linux/fanotify.h + FARSYNC SYNCHRONOUS DRIVER M: Kevin Curtis W: http://www.farsite.co.uk/