tree c7299fd3a791fa3941a53a4f4651101f0067e251
parent 56195e9d1d68a9c201587cb55b7fdf6d43fb31b6
parent 5800790a925b0aefb621ae3da86668c3a2867750
author Bjorn Helgaas <bhelgaas@google.com> 1487711744 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1487711744 -0600

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