Merge branch 'sched/core' into cpus4096
Conflicts: include/linux/ftrace.h kernel/sched.c
This commit is contained in:
commit
45ab6b0c76
166 changed files with 3020 additions and 1777 deletions
|
|
@ -6,6 +6,7 @@
|
|||
#include <linux/ktime.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kallsyms.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/sched.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue