Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 14:51:57 +0000 (16:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 14:51:57 +0000 (16:51 +0200)
1  2 
include/linux/sched.h
kernel/sched.c

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