Merge tag 'v3.15' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:05:20 +0000 (20:05 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:05:20 +0000 (20:05 +0100)
commitf3f39037b9dcf6654379c3edc8070fe75fb3b153
tree7df8132ab925d01c527d93f9fb5365aec69cfcfd
parent47b44e5aa18822b15f7f0b5047a81dfbcbb112ea
parent1860e379875dfe7271c649058aeddffe5afd9d0d
Merge tag 'v3.15' into p/abusse/merge_upgrade

Linux 3.15

# Conflicts:
# kernel/sched/Makefile
21 files changed:
Makefile
arch/x86/Kconfig.debug
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/Makefile
kernel/sched/cfs/auto_group.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cpupri.c
kernel/sched/cfs/cpupri.h
kernel/sched/cfs/cputime.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/idle_task.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.c
kernel/sched/cfs/stop_task.c
kernel/sysctl.c