diff --git a/[refs] b/[refs] index 46096b5fd536..4383012932ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a806c510de490318846b53bbfec463d02ca274b +refs/heads/master: c9f04f5847c17d9933c5bd795c6c3740e96058e9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f73381af4d5e..48aa6d3d3ce9 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1169,6 +1169,12 @@ L: linux-input@atrey.karlin.mff.cuni.cz L: linux-joystick@atrey.karlin.mff.cuni.cz S: Maintained +INOTIFY +P: John McCutchan and Robert Love +M: ttb@tentacle.dhs.org and rml@novell.com +L: linux-kernel@vger.kernel.org +S: Maintained + INTEL 810/815 FRAMEBUFFER DRIVER P: Antonino Daplas M: adaplas@pol.net