Merge tag 'v4.3' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:50:22 +0000 (21:50 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:50:22 +0000 (21:50 +0100)
Linux 4.3

18 files changed:
1  2 
.gitignore
Makefile
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cputime.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/features.h
kernel/sched/cfs/idle_task.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stop_task.c
kernel/sched/idle.c
kernel/sysctl.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/cpu.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge