linux-next: manual merge of the clk tree with the sunxi tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/sunxi/clk-sun6i-ar100.c

between commit:

  3ca2377b6fed ("clk: sunxi: rewrite sun6i-ar100 using factors clk")

from the sunxi tree and commit:

  36bf2811416c ("clk: sunxi: Use proper type for of_clk_get_parent_count() return value")

from the clk tree.

I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html