Merge commit 'v2.6.39-rc4' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Apr 2011 09:39:21 +0000 (11:39 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Apr 2011 09:39:28 +0000 (11:39 +0200)
commit42ac9e87fdd89b77fa2ca0a5226023c1c2d83226
treedfdb1b720347a40f24a89a3e9c2727ae26ad5f01
parent057f3fadb347e9c51b07e1b277bbdda79f976768
parentf0e615c3cb72b42191b558c130409335812621d8
Merge commit 'v2.6.39-rc4' into sched/core

Merge reason: Pick up upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/blackfin/mach-common/smp.c
include/linux/sched.h
kernel/sched.c