From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Aug 2009 19:26:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.31-rc8~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9c504cadc443a3d002fa581ec5109c0ef02d7b14;p=linux.git

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  inotify: Ensure we alwasy write the terminating NULL.
  inotify: fix locking around inotify watching in the idr
  inotify: do not BUG on idr entries at inotify destruction
  inotify: seperate new watch creation updating existing watches
---

9c504cadc443a3d002fa581ec5109c0ef02d7b14