From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 29 Mar 2013 14:55:26 +0000 (-0600)
Subject: Merge branch 'pci/shuah-defines' into next
X-Git-Tag: v3.10-rc1~198^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=833260631178aa26c70a0b05eabc953f5e47167d;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'pci/shuah-defines' into next

* pci/shuah-defines:
  iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI
  iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
  PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
  PCI: Add PCI_BUS_NUM() and PCI_DEVID() interfaces
---

833260631178aa26c70a0b05eabc953f5e47167d