git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41945f6 8b15575)
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Sep 2010 16:45:01 +0000 (18:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Sep 2010 16:45:01 +0000 (18:45 +0200)
Conflicts:
kernel/hw_breakpoint.c

Merge reason: resolve the conflict.

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

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