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)
* pci/resource:
  PCI: Ignore requested alignment for VF BARs
  PCI: Ignore requested alignment for PROBE_ONLY and fixed resources

1  2 
drivers/pci/pci.c

Simple merge