Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
commitd995053d045d777e78ba7eba71a6a0733f3aa726
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:28:28 +0000 (22 08:28 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:28:28 +0000 (22 08:28 +0900)
tree35cb9e017f55034534b3fdf944e6f263785c49ac
parentbe8db0b843d4eef193e996c3e31aabf15b2d7004
parent945526846a84c00adac1efd1c6befdaa77039623
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  dnotify: ignore FS_EVENT_ON_CHILD
  inotify: fix coalesce duplicate events into a single event in special case
  inotify: deprecate the inotify kernel interface
  fsnotify: do not set group for a mark before it is on the i_list