Skip to content
Commit 10a010f6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/x2apic



Conflicts:

	drivers/pci/dmar.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 510b3725 fb2e405f
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