Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
dnotify
fanotify	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
inotify	inotify: stop kernel memory leak on file creation failure	2010-12-07 16:14:22 -05:00
fsnotify.c	fsnotify: call fsnotify_parent in perm events	2010-10-28 17:22:13 -04:00
fsnotify.h
group.c
inode_mark.c	fsnotify: implement ordering between notifiers	2010-10-28 17:22:13 -04:00
Kconfig	fanotify: allow fanotify to be built	2010-10-28 17:22:13 -04:00
Makefile
mark.c
notification.c	Revert "fsnotify: store struct file not struct path"	2010-08-12 14:23:04 -07:00
vfsmount_mark.c	fsnotify: implement ordering between notifiers	2010-10-28 17:22:13 -04:00