git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c56d340
69902c7
)
Merge branch 'perf/kprobes' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Thu, 5 Jun 2014 09:18:34 +0000
(11:18 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 5 Jun 2014 10:26:50 +0000
(12:26 +0200)
Conflicts:
arch/x86/kernel/traps.c
The kprobes enhancements are fully cooked, ship them upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff