Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new patches

Browse source

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

...

This commit is contained in:

Ingo Molnar 2015-02-04 07:44:00 +01:00

parent 16b269436b 40767b0dc7

commit 4c195c8a19

3 changed files with 30 additions and 7 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/wait.h

View file

33

kernel/sched/core.c

View file

3

kernel/sched/deadline.c

View file