On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu <[email protected]> wrote:
>
> There are some merge conflicts. Hope attached patch could help Linus a
> little bit.
Hmm. My merge does not agree with yours at all in the MIPS
pcibios_fixup_bus() area.
Your patch re-introduces the device resource fixup that Bjorn removed,
for example.
I think my merge is correct, but hey, people should double-check.
Linus
_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss
