projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84bb671 5168ae5)
Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:34:40 +0000 (19:34 +0200)
1  2 
kernel/sched.c patch | diff1 | diff2 | blob | history
kernel/trace/ring_buffer.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/sched.c
Simple merge
diff --cc kernel/trace/ring_buffer.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
Domain: System / Uncategorized;