Merge branch 'pci/jiang-iov-fixes' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 5 Jun 2013 18:27:19 +0000 (12:27 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 5 Jun 2013 18:27:19 +0000 (12:27 -0600)
* pci/jiang-iov-fixes:
  PCI: Hide remove and rescan sysfs interfaces for SR-IOV virtual functions
  PCI: Finish SR-IOV VF setup before adding the device

1  2 
drivers/pci/pci-sysfs.c

Simple merge