> I could use some suggestions on the best way to resolve the merge issues > we have currently. It appears that we have three bases that platforms > need to port over the common clk framework: > > Russell's clkdev > Arnd's arm-soc > My clk-next branch Hi Mike The Orion code only depends on clk-next. I've been more conservative with the changes, knowing that once they are merged i can add more patches to make use of devm_get_clk() etc. So for my, as well as going in via arm-soc, i could also imaging giving you a pull request and becoming part of clk-next. However, i don't care what route they take. Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html