]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Thu, 17 May 2012 10:17:10 +0000 (12:17 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 17 May 2012 10:17:12 +0000 (12:17 +0200)
Merge reason: bring together all the pending scheduler bits,
              for the sched/numa changes.

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

Simple merge