From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 21:11:04 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.36-rc3~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=30c0f6a04975d557f3c1a4e640b3808b1231c3ef

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

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  fsnotify: drop two useless bools in the fnsotify main loop
  fsnotify: fix list walk order
  fanotify: Return EPERM when a process is not privileged
  fanotify: resize pid and reorder structure
  fanotify: drop duplicate pr_debug statement
  fanotify: flush outstanding perm requests on group destroy
  fsnotify: fix ignored mask handling between inode and vfsmount marks
  fanotify: add MAINTAINERS entry
  fsnotify: reset used_inode and used_vfsmount on each pass
  fanotify: do not dereference inode_mark when it is unset
---

30c0f6a04975d557f3c1a4e640b3808b1231c3ef