tree 40a48fe2eabbab01133047ee5055ab8f853deac4
parent 97b2073ff04814a7f2fef5fe0e82bb008cad7d8e
parent b3b38d842fa367d862b83e7670af4e0fd6a80fc0
author Linus Torvalds <torvalds@linux-foundation.org> 1273862982 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273862982 -0700

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