tree 1810eef473172ab9e8ff52ded5e81f39eb8af748
parent 5c6fb0059cec9a3c0f6d88a0ddf3d62ad323cd57
parent 528da3e9e237059a84a2625e942811cf824a6efd
author Linus Torvalds <torvalds@linux-foundation.org> 1245458804 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245458804 -0700

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

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  inotify: inotify_destroy_mark_entry could get called twice