mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-05-24 23:56:33 +00: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.