git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75e3375
d28daf9
)
Merge branch 'tracing/core' into tracing/hw-breakpoints
author
Ingo Molnar
<mingo@elte.hu>
Mon, 7 Sep 2009 06:19:51 +0000
(08:19 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 7 Sep 2009 06:19:51 +0000
(08:19 +0200)
Conflicts:
arch/Kconfig
kernel/trace/trace.h
Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff