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
..
fanotify.c	fanotify: on group destroy allow all waiters to bypass permission check	2010-12-07 16:14:22 -05:00
fanotify_user.c	fanotify: fill in the metadata_len field on struct fanotify_event_metadata	2010-12-15 13:58:18 -05:00
Kconfig	Kconfig: typo: and -> an	2010-11-01 15:17:29 -04:00
Makefile	fanotify: fanotify_init syscall declaration	2010-07-28 09:58:55 -04:00