From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 15 Apr 2013 20:26:15 +0000 (-0600)
Subject: Merge branch 'pci/gabor-get-of-node' into next
X-Git-Tag: dm-3.10-changes-2~171^2~6
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=272e70c0ded509906b7469ea0d487725ef1c17b3;p=linux-dmdedup.git

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

272e70c0ded509906b7469ea0d487725ef1c17b3