Merge branch 'sched' into sched-devel

Browse source

Conflicts:

	kernel/sched_rt.c

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

...

This commit is contained in:

Ingo Molnar 2008-06-19 09:09:15 +02:00

parent 20b6331bfe 15a8641ead

commit 1cdad71537

2 changed files with 40 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

3

kernel/sched.c

View file

67

kernel/sched_rt.c

View file