Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 48b1fddb authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'irq/numa' into x86/mce3



Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents 38736072 ee4c24a5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment