git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e2ee2a
a86c0b9
)
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
author
Paul Walmsley
<paul@pwsan.com>
Sun, 23 Sep 2012 23:27:43 +0000
(17:27 -0600)
committer
Paul Walmsley
<paul@pwsan.com>
Sun, 23 Sep 2012 23:27:43 +0000
(17:27 -0600)
Conflicts:
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clock.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff