git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f5e988
cd65718
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Tue, 29 Oct 2013 10:23:32 +0000
(11:23 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Tue, 29 Oct 2013 10:23:32 +0000
(11:23 +0100)
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
Trivial merge