Skip to content
Commit 14b6848b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-clks3' into devel 

Conflicts:

	arch/arm/mach-omap2/clock.c
parents 05d9881b 4da37821
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment