git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e08643 4464fca)
Merge branch 'perfcounters/urgent' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 19 Aug 2009 12:50:35 +0000 (14:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 24 Aug 2009 07:24:01 +0000 (09:24 +0200)
commit96d6e48bc6b38342a59ccd23e25907d12caaeaf8
treeb770d9e94545e198e120fac31f650600a855f689tree
parent6e086437f35ad9fda448711732c4ce0f82aad569commit | diff
parent4464fcaa9cbfc9c551956b48af203e2f775ca892commit | diff
Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
tools/perf/builtin-annotate.c
tools/perf/builtin-report.c

Merge reason: resolve these conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-annotate.c diff1 | diff2 | blob | history
tools/perf/builtin-report.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.