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

Merge branch 'linus' into perfcounters/core 

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