mirror of
https://github.com/torvalds/linux
synced 2026-06-14 06:12:18 +09:00
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.