Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Aug 2009 05:39:44 +0000 (19:39 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Aug 2009 05:39:44 +0000 (19:39 -1000)
* '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


Trivial merge