linux-next: manual merge of the akpm-current tree with the pci tree
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/ntb/hw/mscc/ntb_hw_switchtec.c between commit: cfdfc14e7fb8 ("switchtec: Use generic PCI Vendor ID and Class Code") from the pci tree and commit: a2a35435484e ("ntb: ntb_hw_switchtec: cleanup 64bit IO d
