git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 716a423 07903af)
Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sun, 2 Aug 2009 12:11:26 +0000 (14:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 2 Aug 2009 12:23:57 +0000 (14:23 +0200)
Merge reason: avoid upcoming patch conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/sched.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched.c
Simple merge
Pandora Kernel Repository