Merge tag 'v3.10' into p/abusse/tmp_310
authorAnselm Busse <mail@anselm-busse.de>
Mon, 18 Jan 2016 13:02:06 +0000 (14:02 +0100)
committerAnselm Busse <mail@anselm-busse.de>
Mon, 18 Jan 2016 13:02:06 +0000 (14:02 +0100)
commit725211fcbd0d66d97d2b940d8233e957e8d1094f
tree2a11d10fd753d27adc71966e4197d8db2940b410
parent365287af2a55ea99d4222998cf0b693ac606fb17
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376
Merge tag 'v3.10' into p/abusse/tmp_310

Linux 3.10

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