]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into sched/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 2 Feb 2014 08:45:39 +0000 (09:45 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 2 Feb 2014 08:45:39 +0000 (09:45 +0100)
commit7f1b595de05e7c517884cf3ce7b6073ac7fa1e26
treec05d5d6ca3f625d72a9d136b4c485d3dc9472089
parent29d3c07c8b77dbacc63133059e1dc04e7cad2582
parent22ce914719fccb4c11132dc2a130cec2eadcdfb2
Merge branch 'linus' into sched/core, to resolve conflicts

Conflicts:
kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Documentation/sysctl/kernel.txt
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c
kernel/sysctl.c
mm/mempolicy.c