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

Merge branch 'clk-next-hi6220' into clk-next 

Conflicts:
	drivers/clk/Kconfig
parents 19fbbbbc 72ea4861
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