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)
commit8442edc18843491978f7820f87dbdf293461290e
tree87052e51e6398843799511e009159e27bda2aee1
parent825e1e23914b9c3dbc49ee8c5a1d1cb421c1270a
parent750a8870fe4016ef3091fc97e084d58c613c2cc7
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