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. |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
fanotify.c | ||
fanotify_user.c |
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. |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
fanotify.c | ||
fanotify_user.c |