tree 35cb9e017f55034534b3fdf944e6f263785c49ac
parent be8db0b843d4eef193e996c3e31aabf15b2d7004
parent 945526846a84c00adac1efd1c6befdaa77039623
author Linus Torvalds <torvalds@linux-foundation.org> 1256167708 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1256167708 +0900

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