| commit | 4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 14 11:49:42 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 14 11:49:42 2010 -0700 |
| tree | 40a48fe2eabbab01133047ee5055ab8f853deac4 | |
| parent | 97b2073ff04814a7f2fef5fe0e82bb008cad7d8e [diff] | |
| parent | b3b38d842fa367d862b83e7670af4e0fd6a80fc0 [diff] |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify * 'for-linus' of git://git.infradead.org/users/eparis/notify: inotify: don't leak user struct on inotify release inotify: race use after free/double free in inotify inode marks inotify: clean up the inotify_add_watch out path Inotify: undefined reference to `anon_inode_getfd' Manual merge to remove duplicate "select ANON_INODES" from Kconfig file