Hi on second thought... On Thu, 8 Mar 2012, Paul Walmsley wrote: > On Thu, 8 Mar 2012, Tony Lindgren wrote: > > > Got these now merged into l-o master, but ran into a merge > > conflict with already queued sr branch. Resolved it by using > > your version except left out vdd_name. > > Definitely we want the vdd_name fields. Other than that it looks okay. I guess that other SR series that you merged removed the vdd_name fields? If so then yeah, we'd better leave those out. This means that I'm going to have to rebase those big hwmod data changes :-( Can you send me a stable commit for that? - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
