From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jun 2009 00:46:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.31-rc1~106
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bee89ab228e6f51c4ddd3481b9bd491859a8ee7b;p=pandora-kernel.git

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
---

bee89ab228e6f51c4ddd3481b9bd491859a8ee7b
Reading git-diff-tree failed