git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cb6e943
c1ab9ca
)
Merge commit 'tip/tracing/core' into oprofile/core
author
Robert Richter
<robert.richter@amd.com>
Fri, 23 Apr 2010 14:47:51 +0000
(16:47 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Fri, 23 Apr 2010 14:47:51 +0000
(16:47 +0200)
Conflicts:
drivers/oprofile/cpu_buffer.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff