From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 May 2010 18:49:42 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.34~13
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e

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
---

4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e