Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 4fb85d35 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7 

Conflicts:
	arch/arm/mach-omap2/clkt34xx_dpll3m2.c
	arch/arm/mach-omap2/clkt_clksel.c
	arch/arm/mach-omap2/clock.c
parents 1e2ee2a6 a86c0b98
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment