Merge tag 'v3.11' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 13:28:14 +0000 (14:28 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 13:28:14 +0000 (14:28 +0100)
commit00a7db57439f118011f6c16613862c33354cff2d
tree8dd0e5b9152afc86bd1d536095ff4a45a7705612
parent725211fcbd0d66d97d2b940d8233e957e8d1094f
parent6e4664525b1db28f8c4e1130957f70a94c19213e
Merge tag 'v3.11' into p/abusse/merge_upgrade

Linux 3.11

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