From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Aug 2009 05:39:44 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.31-rc9~34
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8442edc18843491978f7820f87dbdf293461290e;p=linux.git

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  inotify: update the group mask on mark addition
  inotify: fix length reporting and size checking
  inotify: do not send a block of zeros when no pathname is available
---

8442edc18843491978f7820f87dbdf293461290e