Merge tag 'v3.14' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 15:06:07 +0000 (16:06 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 15:06:07 +0000 (16:06 +0100)
commit47b44e5aa18822b15f7f0b5047a81dfbcbb112ea
tree81fcee794b0d5f7d9c3ced2e5f5dc9c259d7044a
parente090a6cec7b2e5e5b092cb2fd1c0aa3a38dff6aa
parent455c6fdbd219161bd09b1165f11699d6d73de11c
Merge tag 'v3.14' into p/abusse/merge_upgrade

Linux 3.14

# Conflicts:
# .gitignore
# include/linux/sched.h
# kernel/sched/Makefile
15 files changed:
.gitignore
Makefile
arch/x86/Kconfig.debug
include/linux/sched.h
init/main.c
kernel/sched/Makefile
kernel/sched/cfs/Makefile
kernel/sched/cfs/core.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stop_task.c
kernel/sched/modsched/Makefile
kernel/sysctl.c