git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f87dfb
5951290
)
Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip
author
Robert Richter
<robert.richter@amd.com>
Wed, 15 Oct 2008 20:19:41 +0000
(22:19 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Wed, 15 Oct 2008 20:19:41 +0000
(22:19 +0200)
Conflicts:
arch/x86/oprofile/op_model_ppro.c
Trivial merge