Skip to content
Commit fe767560 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge branch 'clk-omap-legacy' into clk-next 

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c
parents 035a61c3 d6540b19
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment