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

Merge branch 'x86/urgent' into core/percpu 

Conflicts:
	arch/x86/kernel/acpi/boot.c
parents 5d96218b d315760f
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