git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4fe7041
2e57289
)
Merge branch 'tracing/core-v2' into tracing-for-linus
author
Ingo Molnar
<mingo@elte.hu>
Wed, 1 Apr 2009 19:54:19 +0000
(21:54 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 1 Apr 2009 22:49:02 +0000
(
00:49
+0200)
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Trivial merge