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

Merge branch 'linus' into x86/apic 

Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c
parents ba1511bf 071a0bc2
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