Merge branch 'pci/gabor-get-of-node' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 15 Apr 2013 20:26:15 +0000 (14:26 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 15 Apr 2013 20:26:15 +0000 (14:26 -0600)
commit272e70c0ded509906b7469ea0d487725ef1c17b3
treefe14da14dffbe51dc689f9bac3e6e85c145a08bf
parent833260631178aa26c70a0b05eabc953f5e47167d
parent9a97cd43f4ef62520a852b5a2348233b0f37455b
Merge branch 'pci/gabor-get-of-node' into next

* pci/gabor-get-of-node:
  MIPS/PCI: Implement pcibios_get_phb_of_node
  PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
include/linux/pci.h