From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Feb 2017 17:56:11 +0000 (-0600)
Subject: Merge branch 'pci/virtualization' into next
X-Git-Tag: v4.11-rc1~92^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8b9c156262f9ebaa88736b93263c1af5ae5fa43e;p=linux.git

Merge branch 'pci/virtualization' into next

* pci/virtualization:
  PCI: Lock each enable/disable num_vfs operation in sysfs
  PCI: Add ACS quirk for Intel Union Point
---

8b9c156262f9ebaa88736b93263c1af5ae5fa43e