From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 21 May 2013 16:57:54 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: firefly_0821_release~176^2~5787^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=755bda3fe3006eae7298f0f58c59313088e30196;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it
  sparc/PCI: Use PCI_UNKNOWN for unknown power state
  powerpc/PCI: Use PCI_UNKNOWN for unknown power state
  PCI/ACPI: Check acpi_resource_to_address64() return value
  PCI: Work around Ivytown NTB BAR size issue
---

755bda3fe3006eae7298f0f58c59313088e30196