Merge branch 'pci/resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:43:21 +0000 (09:43 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:43:21 +0000 (09:43 -0500)
commite15194d2a726b7201878d17ee87fa80d89aaabf4
tree12590cdff35e271df867ef42a88c72aa687b89a7
parent3f4f35678fb83da2f9ef17ddaa7507a45c2f7049
parent62d9a78f32d9a1b0f6fdae70751deeae6335e74b
Merge branch 'pci/resource' into next

* pci/resource:
  PCI: Ignore requested alignment for VF BARs
  PCI: Ignore requested alignment for PROBE_ONLY and fixed resources
drivers/pci/pci.c