Merge branch 'pci/virtualization' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:11 +0000 (11:56 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:11 +0000 (11:56 -0600)
* pci/virtualization:
  PCI: Lock each enable/disable num_vfs operation in sysfs
  PCI: Add ACS quirk for Intel Union Point


Trivial merge