Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Tue, 4 Sep 2012 12:31:00 +0000 (14:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Sep 2012 12:31:00 +0000 (14:31 +0200)
commit59f979455d7209171ab10a72c8df5c2512976cb4
treec4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a
parentb9bb50db9126c4ccad78af2dfb77277ca17c9b64
parent9450d57eab5cad36774c297da123062744472588
Merge branch 'sched/urgent' into sched/core

Merge in the current fixes branch, we are going to apply dependent patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/s390/Kconfig
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h