Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 18:49:42 +0000 (11:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 18:49:42 +0000 (11:49 -0700)
commit4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e
tree40a48fe2eabbab01133047ee5055ab8f853deac4
parent97b2073ff04814a7f2fef5fe0e82bb008cad7d8e
parentb3b38d842fa367d862b83e7670af4e0fd6a80fc0
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