From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Jan 2014 23:46:15 +0000 (-0700)
Subject: Merge branch 'pci/aer' into next
X-Git-Tag: firefly_0821_release~176^2~4608^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/aer' into next

* pci/aer:
  PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0
  ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
---

6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2