* Tero Kristo <t-kristo@xxxxxx> [160401 11:50]: > > Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains > for some reason. It should be under clocks. Oh OK, I'll wait for an updated patch against v4.6-rc1 then. Might be worth checking it applies cleanly against omap-for-v4.6/fixes-rc1 too. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html