The following commit has been merged in the linux branch: commit d995053d045d777e78ba7eba71a6a0733f3aa726 Merge: be8db0b843d4eef193e996c3e31aabf15b2d7004 945526846a84c00adac1efd1c6befdaa77039623 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 22 08:28:28 2009 +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