Skip to content
Snippets Groups Projects
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
Loading
Showing
with 1519 additions and 877 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment