git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7cb2e3e
1c569f0
)
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
author
Ingo Molnar
<mingo@elte.hu>
Wed, 26 Aug 2009 06:29:02 +0000
(08:29 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 26 Aug 2009 06:29:02 +0000
(08:29 +0200)
Conflicts:
include/linux/tracepoint.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff