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

Merge branch 'x86/urgent' into x86/irq 



Merge reason: conflict in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents ca4dbc66 eb5b3794
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment