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

12 files changed:
1  2 
Makefile
include/linux/sched.h
init/main.c
kernel/Makefile
kernel/cpu.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cputime.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stats.h
kernel/sysctl.c

diff --cc Makefile
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/cpu.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge