Merge commit 'v2.6.30-rc5' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 10:59:32 +0000 (12:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 10:59:37 +0000 (12:59 +0200)
Merge reason: sched/core was on .30-rc1 before, update to latest fixes

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

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