Re: [git pull] PCI changes (including maintainer change)

On Fri, Mar 23, 2012 at 2:10 PM, Linus Torvalds
[off-list ref] wrote:

On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu [off-list ref] wrote:

quoted

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.

yes, you are right.

Yinghai