git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
51563a0
940010c
)
Merge commit 'tip/perfcounters-for-linus' into oprofile/master
author
Robert Richter
<robert.richter@amd.com>
Fri, 12 Jun 2009 15:58:48 +0000
(17:58 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Fri, 12 Jun 2009 15:58:48 +0000
(17:58 +0200)
Conflicts:
arch/x86/oprofile/op_model_ppro.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff