Merge tag 'v4.1' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:27:34 +0000 (21:27 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:27:34 +0000 (21:27 +0100)
commit27ddce6f76d323fd1c51fba5af07895ab8ced21e
treea2825af04e1d7f71acffde45b99c0fd81e277c45
parent28fed7680a1b1ac7a1676ea8253c31d2d39f3b9c
parentb953c0d234bc72e8489d3bf51a276c5c4ec85345
Merge tag 'v4.1' into p/abusse/merge_upgrade

Linux 4.1

# Conflicts:
# include/linux/sched.h
# init/main.c
15 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/core.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/features.h
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/idle.c
kernel/sysctl.c