git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
32b0ed3
44b11fe
)
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Mon, 11 May 2015 09:56:27 +0000
(11:56 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 11 May 2015 09:56:27 +0000
(11:56 +0200)
Conflicts:
tools/perf/builtin-kmem.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff