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
--
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
