Merge tag 'v4.0' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:19:17 +0000 (21:19 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:19:17 +0000 (21:19 +0100)
commit28fed7680a1b1ac7a1676ea8253c31d2d39f3b9c
tree13cf4a14a5e5f72dbd0b2e13fdb25394d7805aa0
parent3a2c738e0e7d85a9f538f35db40e11467d6e2a70
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76
Merge tag 'v4.0' into p/abusse/merge_upgrade

Linux 4.0

# Conflicts:
# kernel/sched/Makefile
17 files changed:
.gitignore
Makefile
arch/x86/Kconfig.debug
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/sched/cfs/Makefile
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/core.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.c
kernel/sched/idle.c
kernel/sysctl.c