Merge tag 'v3.13' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 14:26:47 +0000 (15:26 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 14:26:47 +0000 (15:26 +0100)
commite090a6cec7b2e5e5b092cb2fd1c0aa3a38dff6aa
treea58b7151fd4ac4cc96a211f54e8cd236e5324fa8
parent1dc317ae75312aac207e27bdb536f28a5baf53c6
parentd8ec26d7f8287f5788a494f56e8814210f0e64be
Merge tag 'v3.13' into p/abusse/merge_upgrade

Linux 3.13

# Conflicts:
# kernel/Makefile
# kernel/sched/Makefile
18 files changed:
Makefile
arch/x86/Kconfig.debug
arch/x86/kernel/vmlinux.lds.S
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/Makefile
kernel/sched/cfs/core.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/features.h
kernel/sched/cfs/idle_task.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.h
kernel/sched/cfs/stop_task.c
kernel/sysctl.c