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)
* pci/gabor-get-of-node:
  MIPS/PCI: Implement pcibios_get_phb_of_node
  PCI: Remove __weak annotation from pcibios_get_phb_of_node decl

1  2 
include/linux/pci.h

Simple merge