linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  include/linux/pci_ids.h

between commit:

  2d1e0254ef83 ("pci_ids: add Netronome Systems vendor")

from Linus' tree and commit:

  a755e169031d ("PCI: Add Netronome vendor and device IDs")

from the pci tree.

I fixed it up (the latter is just a superset of the former) and can
carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx