Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 13:50:22 +0000 (15:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 13:50:40 +0000 (15:50 +0200)
Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

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