Merge tag 'v3.19' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:06:48 +0000 (21:06 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:06:48 +0000 (21:06 +0100)
commit3a2c738e0e7d85a9f538f35db40e11467d6e2a70
tree7cdd0d967e7837da7b0170dd5cf2dda0df3e6f5f
parentce44c5ef2dbef729beb54aa6b284ba6dbf62ba8a
parentbfa76d49576599a4b9f9b7a71f23d73d6dcff735
Merge tag 'v3.19' into p/abusse/merge_upgrade

Linux 3.19

# Conflicts:
# .gitignore
# include/linux/sched.h
13 files changed:
.gitignore
Makefile
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cpupri.h
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sysctl.c