projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8177197
5140434
)
Merge branch 'oprofile/core' (early part) into oprofile/perf
author
Robert Richter
<robert.richter@amd.com>
Mon, 11 Oct 2010 17:33:42 +0000
(19:33 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Mon, 11 Oct 2010 17:33:42 +0000
(19:33 +0200)
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff