Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:46:44 +0000 (17:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:46:44 +0000 (17:46 -0700)
commitbee89ab228e6f51c4ddd3481b9bd491859a8ee7b
tree1810eef473172ab9e8ff52ded5e81f39eb8af748
parent5c6fb0059cec9a3c0f6d88a0ddf3d62ad323cd57
parent528da3e9e237059a84a2625e942811cf824a6efd
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