Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Aug 2009 19:26:02 +0000 (12:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Aug 2009 19:26:02 +0000 (12:26 -0700)
commit9c504cadc443a3d002fa581ec5109c0ef02d7b14
tree0b44c60843062e5ee8d91a636dab67ada5286156
parent4f8ee2c9cc0e885d2bb50ef26db66150ab25213e
parent0db501bd0610ee0c0aca84d927f90bcccd09e2bd
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