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)
commit1f56ee7b68fecd45d25bdcf2eda7507797594424
tree782ec71491cdfb0ce5d5117428be6c3af7070207
parent6135fc1eb4b1c9ae5f535507ed59591bab51e630
parent01f23e1630d944f7085cd8fd5793e31ea91c03d8
Merge branch 'sched/arch' into sched/urgent

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>
kernel/sched/core.c
kernel/sched/sched.h