Merge branch 'sched/urgent' into sched/core

Browse source

Conflicts: kernel/sched.c

Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

...

This commit is contained in:

Thomas Gleixner 2010-02-16 16:48:56 +01:00

parent 301ba0457f 0970d2992d

commit 6e40f5bbbc

3 changed files with 63 additions and 30 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

5

include/linux/sched.h

View file

73

kernel/sched.c

View file

15

kernel/sched_fair.c

View file