Merge tag 'v4.2' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:50:10 +0000 (21:50 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:50:10 +0000 (21:50 +0100)
commitc6088086dc53ff5fa05845d60c4feefc27bb4f87
tree4940073306930afbb783ac4b7a20f950eef67ae3
parent27ddce6f76d323fd1c51fba5af07895ab8ced21e
parent64291f7db5bd8150a74ad2036f1037e6a0428df2
Merge tag 'v4.2' into p/abusse/merge_upgrade

Linux 4.2

# Conflicts:
# arch/x86/Kconfig.debug
# include/linux/sched.h
# kernel/sched/Makefile
19 files changed:
Makefile
arch/x86/Kconfig.debug
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/Makefile
kernel/sched/cfs/Makefile
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/auto_group.h
kernel/sched/cfs/core.c
kernel/sched/cfs/cputime.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.h
kernel/sched/idle.c
kernel/sysctl.c