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

diff --cc arch/sh/drivers/pci/pci.c
Simple merge

diff --cc arch/sparc/kernel/leon_pci.c
Simple merge

diff --cc arch/tile/kernel/pci.c
Simple merge

diff --cc arch/tile/kernel/pci_gx.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge