* Stephen Rothwell <[email protected]> [160302 14:16]: > Hi Krzysztof, > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > drivers/clk/Kconfig > > between commit: > > 21330497f303 ("clk: ti: Add support for dm814x ADPLL") > > from the omap tree and commit: > > b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section") > > from the samsung-krzk tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks yes that's correct thanks! Regards, Tony
