tree 0b44c60843062e5ee8d91a636dab67ada5286156
parent 4f8ee2c9cc0e885d2bb50ef26db66150ab25213e
parent 0db501bd0610ee0c0aca84d927f90bcccd09e2bd
author Linus Torvalds <torvalds@linux-foundation.org> 1251401162 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251401162 -0700

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