Skip to content
Commit 948a7b2b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'irq/sparseirq' into cpus4096 

Conflicts:
	arch/x86/kernel/io_apic.c

Merge irq/sparseirq here, to resolve conflicts.
parents 9466d603 17483a1f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment