Merge branch 'sched/arch' into sched/urgent
authorIngo Molnar <mingo@kernel.org>
Thu, 29 Mar 2012 10:48:15 +0000 (12:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 29 Mar 2012 10:48:22 +0000 (12:48 +0200)
Merge reason: It has not gone upstream via the ARM tree, merge it via
              the scheduler tree.

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

Simple merge
Simple merge