mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-28 18:08:45 +00:00
Conflicts: arch/x86/kernel/cpu/mcheck/mce_64.c arch/x86/kernel/irq.c Merge reason: Resolve the conflicts above. Signed-off-by: Ingo Molnar <mingo@elte.hu>