[git pull] PCI changes (including maintainer change)
yinghai at kernel.org
Sat Mar 24 08:29:33 EST 2012
On Fri, Mar 23, 2012 at 2:10 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu <yinghai at kernel.org> 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.
yes, you are right.
More information about the Linuxppc-dev