From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 21 Feb 2017 21:15:44 +0000 (-0600)
Subject: Merge branch 'pci/host-rockchip' into next
X-Git-Tag: v4.11-rc1~92^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bcea623c65d5ad3b2f4e51908cffc9423175a10b;p=linux.git

Merge branch 'pci/host-rockchip' into next

* pci/host-rockchip:
  PCI: rockchip: Set vendor ID from local core config space
  PCI: rockchip: Fix rockchip_pcie_probe() error path to free resource list
  PCI: rockchip: Mark PM functions as __maybe_unused
  PCI: rockchip: Use readl_poll_timeout() instead of open-coding it
  PCI: rockchip: Disable RC's ASPM L0s based on DT "aspm-no-l0s"
  PCI: rockchip: Add system PM support
---

bcea623c65d5ad3b2f4e51908cffc9423175a10b