git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7df01d9
0fdf136
)
Merge remote branch 'tip/perf/core' into oprofile/core
author
Robert Richter
<robert.richter@amd.com>
Fri, 15 Oct 2010 10:45:00 +0000
(12:45 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Fri, 15 Oct 2010 10:45:00 +0000
(12:45 +0200)
Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff