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

Merge branch 'linus' into cpumask-for-linus

Conflicts:
	arch/x86/kernel/cpu/common.c
parents 8c083f08 dfbbe89e
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