From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 5 Jul 2012 21:31:05 +0000 (-0600)
Subject: Merge branch 'pci/myron-pcibios_setup' into next
X-Git-Tag: v3.6-rc1~112^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=85a00dd391d2de1e177c5ad8db5672428934ac20;p=linux.git

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

85a00dd391d2de1e177c5ad8db5672428934ac20