mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-25 11:22:21 +00:00
Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c
Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c