]> 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: cd6feee eced1df)
Merge branch 'perfcounters/urgent' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 19:42:56 +0000 (21:42 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 19:42:59 +0000 (21:42 +0200)
Merge reason: We are going to modify a place modified by
              perfcounters/urgent.

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

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