Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 29 Jun 2009 07:16:13 +0000 (09:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 29 Jun 2009 07:16:25 +0000 (09:16 +0200)
Merge reason: we will merge a dependent patch.

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

Simple merge
diff --cc kernel/sched.c
Simple merge