tree 87052e51e6398843799511e009159e27bda2aee1
parent 825e1e23914b9c3dbc49ee8c5a1d1cb421c1270a
parent 750a8870fe4016ef3091fc97e084d58c613c2cc7
author Linus Torvalds <torvalds@linux-foundation.org> 1251524384 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1251524384 -1000

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