Merge branch 'sched/cleanups' into sched/core

Browse source

Merge reason: these bits, formerly in sched/urgent, are too late for v3.10.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2013-05-28 08:15:45 +02:00

parent 424c93fe4c 8527632dc9

commit d07e75a6e0

5 changed files with 605 additions and 588 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

kernel/sched/Makefile

View file

569

kernel/sched/core.c

View file

18

kernel/sched/fair.c

View file

578

kernel/sched/proc.c

View file

26

kernel/sched/sched.h

View file