OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55b4ce6 629ae2e)
Merge branch 'perf/urgent' into perf/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 7 Mar 2018 08:23:12 +0000 (09:23 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 Mar 2018 08:23:12 +0000 (09:23 +0100)
commit3f986eefc89c528bf2d398a6dc3637b743a7139e
tree8a0b4ccffa3502b7907f6ce5ed50b7ca0092e5eetree | snapshot
parent55b4ce61a2a1608881ef7eab8a4e3fab3718dc4dcommit | diff
parent629ae2ee73e225fa7dcce581c005d773b0190dcccommit | diff
Merge branch 'perf/urgent' into perf/core, to resolve conflict

Conflicts:
tools/perf/perf.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/perf/builtin-stat.c diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help