Merge branch 'linus' into core/rcu, to fix up a semantic conflict

Browse source

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

...

This commit is contained in:

Ingo Molnar 2015-10-28 13:17:01 +01:00

parent c13dc31adb a22c4d7e34

commit e4340bbb07

239 changed files with 1791 additions and 1019 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

8

kernel/kmod.c

View file

8

kernel/module.c

View file

12

kernel/sched/core.c

View file

17

kernel/sched/deadline.c

View file

9

kernel/sched/fair.c

View file

2

kernel/sched/idle.c

View file

11

kernel/trace/trace_stack.c

View file