[PATCH 1/4] clk: sunxi: fix A20 PLL4 calculation

[Emilio López]

Hi Mike,

El 19/03/14 16:42, Mike Turquette escribió:
> Quoting Emilio López (2014-03-19 11:19:30)
>> Allwinner actually reworked the PLL4 on A20; now it's compatible with
>> the sun4i PLL5/6 design previous to any divisions, as well as to the new
>> PLL8 in sun7i.
>>
>> Signed-off-by: Emilio López <emilio at elopez.com.ar>
>
> Trivial merge conflict after applying this patch on top of your 3.15
> pull request. My resolution is below. Let me know if I've made a
> mistake.

Looks good to me.

Thanks!

Emilio