git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
740c699
90f6bb6
)
Merge branch 'perf-core-for-mingo' into perf/urgent
author
Ingo Molnar
<mingo@kernel.org>
Mon, 14 Apr 2014 14:45:39 +0000
(16:45 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 14 Apr 2014 14:45:39 +0000
(16:45 +0200)
Conflicts:
tools/perf/bench/numa.c
Pull perf fixes from Jiri Olsa.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge