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

Merge branch 'sched/core' into cpus4096 

Conflicts:
	include/linux/ftrace.h
	kernel/sched.c
parents 81444a79 d65bd5ec
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