From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 7 Sep 2017 18:24:19 +0000 (-0500)
Subject: Merge branch 'pci/resource' into next
X-Git-Tag: v5.4.17~7674^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9198407e23ec89f0e1562f439771aeea83345d0d;p=arm%2Flinux.git

Merge branch 'pci/resource' into next

* pci/resource:
  microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
  ARC: Remove empty kernel/pcibios.c
  PCI: Add a generic weak pcibios_align_resource()
  PCI: Add a generic weak pcibios_fixup_bus()
---

9198407e23ec89f0e1562f439771aeea83345d0d