Subject: linux-next: manual merge of the clk tree with the samsung-krzk tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 16 Feb 2016 15:11:31 +1100

Hi all,

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

  drivers/clk/Kconfig
  drivers/clk/samsung/Kconfig

between commit:

  fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks")

from the samsung-krzk tree and commit:

  b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section")

from the clk tree.

I fixed it up (they both had similar effects) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell