Merge tag 'v3.16' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:25:45 +0000 (20:25 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:25:45 +0000 (20:25 +0100)
commit83e6853b9d7742d57774d4676188d3980362be54
tree7f2b9a176caa69ee22240b95e9aac3e78abed229
parentf3f39037b9dcf6654379c3edc8070fe75fb3b153
parent19583ca584d6f574384e17fe7613dfaeadcdc4a6
Merge tag 'v3.16' into p/abusse/merge_upgrade

Linux 3.16

# Conflicts:
# Makefile
17 files changed:
.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/cpupri.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/cfs/stop_task.c
kernel/sched/idle.c
kernel/sysctl.c