On Thu, Sep 29, 2011 at 04:31:12PM -0400, David Miller wrote: > From: David Daney <[email protected]> > Date: Tue, 27 Sep 2011 16:26:52 -0700 > > > v2: Update bindings to use "reg" and "mdio-parent-bus" insutead of > > "cell-index" and "parent-bus" > > Grant, when the final version of this patch set is ready how do > you want to handle merging it in? > > I think it would be safe to merge this via your tree, since the > changes made to existing network driver files are rather trivial and > thus merge conflict friendly.
Your tree or mine, I'm happy either way. Even if there were conflicts, they would be trivial. Sure, I'll take care of merging it when I see an ack from you. > Actually, I feel like we've discussed this before :-) :) g. _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
