tree c6a53b71b48c49d7713539eb035e7b2fcec69d2a
parent d872694bac212f76ca13fd20a85e5c1bdb53a945
parent c775697b713b70293507573355aa8c8c177db35b
author Bjorn Helgaas <bhelgaas@google.com> 1504808659 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1504808659 -0500

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()