Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 10:00:42 +0000 (12:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 10:01:01 +0000 (12:01 +0200)
commit40a0c68ca9b49fb3e7292c1bae035ba5bcb27903
tree11682834d3442d4640c4464709a76a268869ffbd
parentc61037e905a5cb74c7d786c35ee2cdbab9ed63af
parent7e3115ef5149fc502e3a2e80719dba54a8e7409d
Merge branch 'sched/urgent' into sched/core

Merge in the latest fixes before applying a dependent patch.

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