diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-21 19:28:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-21 19:28:28 -0400 |
| commit | d995053d045d777e78ba7eba71a6a0733f3aa726 (patch) | |
| tree | 35cb9e017f55034534b3fdf944e6f263785c49ac /drivers/net/ne2k-pci.c | |
| parent | be8db0b843d4eef193e996c3e31aabf15b2d7004 (diff) | |
| parent | 945526846a84c00adac1efd1c6befdaa77039623 (diff) | |
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
Diffstat (limited to 'drivers/net/ne2k-pci.c')
0 files changed, 0 insertions, 0 deletions