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

Merge branch 'linus' into core/percpu 

Conflicts:
	arch/x86/kernel/setup_percpu.c
parents 5a611268 5ee81007
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