You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		14 years ago
..
Kconfig	Kconfig: typo: and -> an	14 years ago
Makefile	fanotify: fanotify_init syscall declaration	15 years ago
fanotify.c	fanotify: on group destroy allow all waiters to bypass permission check	14 years ago
fanotify_user.c	fanotify: fill in the metadata_len field on struct fanotify_event_metadata	14 years ago