Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 15:59:54 +0000 (17:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 16:00:01 +0000 (18:00 +0200)
commit994bf1c92270e3d7731ea08f1d1bd7a668314e60
tree4409a21eab486e53fbe350a66e8a4f28b7a720c0
parentbd96efe17d945f0bad56d592f8686dc6309905e7
parentcf6ace16a3cd8b728fb0afa68368fd40bbeae19f
Merge branch 'linus' into sched/core

Merge reason: pick up the latest scheduler fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/sched.h
kernel/sched.c
kernel/sched_fair.c