git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
219e2d6
f0ff01b
)
Merge branch 'devel-clock' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 21:18:57 +0000
(14:18 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 21 Sep 2012 21:18:57 +0000
(14:18 -0700)
Conflicts:
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clkt_dpll.c
arch/arm/mach-omap2/clock.c
drivers/spi/spi-omap2-mcspi.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff