Merge branch 'pci/resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 1 Oct 2014 22:43:41 +0000 (16:43 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 1 Oct 2014 22:43:41 +0000 (16:43 -0600)
* pci/resource:
  PCI: Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources()


Trivial merge