[git pull] PCI changes (including maintainer change)
torvalds at linux-foundation.org
Sat Mar 24 08:10:36 EST 2012
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
Your patch re-introduces the device resource fixup that Bjorn removed,
I think my merge is correct, but hey, people should double-check.
More information about the Linuxppc-dev