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)
commitbb4bac9308bf8df5027dcbf27f1016104e3a504f
tree7c02fddf034225871db208cc6e7fee0f959bcaf3
parent06886e8043877d5c439f5e2a3bcf23761bc1ae9d
parentdfab88beda88d6c24111e5966b08ecf813c3a18a
Merge branch 'pci/jiang-iov-fixes' into next

* 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
drivers/pci/pci-sysfs.c