git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
540804b
0f940cb
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000
(09:47 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000
(09:47 +0200)
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge