Merge branch 'sched/urgent' into timers/urgent

Browse source

Merging it here because an upcoming timers/urgent fix relies on
a change already in sched/urgent and not yet upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-02-05 13:03:28 +01:00

parent a6a95406c6 483b4ee60e

commit 83895147b7

2 changed files with 12 additions and 6 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

1

include/linux/sched.h

View file

17

kernel/sched.c

View file