git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21ace54
cc1226e
)
Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110...
author
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:05 +0000
(22:43 -0700)
committer
Paul Walmsley
<paul@pwsan.com>
Fri, 11 Mar 2011 05:43:05 +0000
(22:43 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff