git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2d403fe
c0718df
)
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2...
author
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000
(22:43 -0700)
committer
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:32 +0000
(22:43 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff