linux-next: manual merge of the pci tree with the mips tree

[Stephen Rothwell]

Hi Bjorn,

Today's linux-next merge of the pci tree got conflicts in
arch/mips/pci/pci-bcm1480.c, arch/mips/pci/pci-octeon.c and
arch/mips/pci/pcie-octeon.c between commit 7b09777c187d ("MIPS: Add
struct pci_ops member names to initialization") from the mips tree and
commit ab1d7f9646fe ("MIPS: PCI: Add struct pci_ops member names to
initialization") from the pci tree.

I fixed it up (same patch, different white space - I used the ones from
the mips tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpAzAOawdRnX.pgp
Description: OpenPGP digital signature