git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2011319
399f0c2
)
Merge branch 'perf/urgent' into perf/core, to resolve conflict
author
Ingo Molnar
<mingo@kernel.org>
Thu, 1 May 2014 06:24:39 +0000
(08:24 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 1 May 2014 06:24:39 +0000
(08:24 +0200)
Conflicts:
tools/perf/arch/x86/tests/dwarf-unwind.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff