Merge branch 'clk-next-hi6220' into clk-next
Conflicts: drivers/clk/Kconfig
Michael Turquette 10 years ago ae8d4048 19fbbbbc