Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Sun, 18 Nov 2012 08:34:44 +0000 (09:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 18 Nov 2012 08:34:44 +0000 (09:34 +0100)
commitec05a2311c35243cea08bca00bcf53a576ee41a2
treeb6feae6520bdeeb40f5c08e509b108d84199db7b
parenta7a0aaa17ace589897021d668e09d474e7fc4c4d
parent5258f386ea4e8454bc801fb443e8a4217da1947c
Merge branch 'sched/urgent' into sched/core

Merge in fixes before we queue up dependent bits, to avoid conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
fs/proc/base.c
kernel/sched/fair.c
kernel/sysctl.c