"git@git.tuxist.de:jan.koester/linux.git" did not exist on "298b34d7d578c3b4325248b823f3d83a8ea1541c"
Merge branch 'x86/asm' into x86/apic, to resolve a conflict
Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Loading
Please sign in to comment