projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55b4ce6
629ae2e
)
Merge branch 'perf/urgent' into perf/core, to resolve conflict
author
Ingo Molnar
<mingo@kernel.org>
Wed, 7 Mar 2018 08:23:12 +0000
(09:23 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 7 Mar 2018 08:23:12 +0000
(09:23 +0100)
Conflicts:
tools/perf/perf.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
tools/perf/builtin-stat.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/perf/builtin-stat.c
Simple merge