git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4cbe75b
98d943b
)
Merge branch 'oprofile/urgent' into oprofile/core
author
Robert Richter
<robert.richter@amd.com>
Fri, 1 Oct 2010 06:54:17 +0000
(08:54 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Fri, 1 Oct 2010 06:54:17 +0000
(08:54 +0200)
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff