]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3299b4d 79a9d46)
Merge branch 'tracing/fastboot' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)
1  2 
kernel/trace/trace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.h patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/trace.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
Clone of davem's net-next-2.6 tree