Merge branch 'pci/myron-pcibios_setup' into next

* pci/myron-pcibios_setup:
  xtensa/PCI: factor out pcibios_setup()
  x86/PCI: adjust section annotations for pcibios_setup()
  unicore32/PCI: adjust section annotations for pcibios_setup()
  tile/PCI: factor out pcibios_setup()
  sparc/PCI: factor out pcibios_setup()
  sh/PCI: adjust section annotations for pcibios_setup()
  sh/PCI: factor out pcibios_setup()
  powerpc/PCI: factor out pcibios_setup()
  parisc/PCI: factor out pcibios_setup()
  MIPS/PCI: adjust section annotations for pcibios_setup()
  MIPS/PCI: factor out pcibios_setup()
  microblaze/PCI: factor out pcibios_setup()
  ia64/PCI: factor out pcibios_setup()
  cris/PCI: factor out pcibios_setup()
  alpha/PCI: factor out pcibios_setup()
  PCI: pull pcibios_setup() up into core

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

diff --cc arch/ia64/pci/pci.c
Simple merge

diff --cc arch/microblaze/pci/pci-common.c
Simple merge

diff --cc arch/mips/pci/pci.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

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

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

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

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

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

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

diff --cc include/linux/pci.h
Simple merge