From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 21 Oct 2020 14:58:35 +0000 (-0500)
Subject: Merge branch 'pci/pm'
X-Git-Tag: v5.10-rc1~58^2~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d2493ab08b4cb6a8fc3e07a8e5667ac077f2e1a;p=linux-platform-drivers-x86.git

Merge branch 'pci/pm'

- Remove unused pcibios_pm_ops (Vaibhav Gupta)

- Rename pci_dev.d3_delay to d3hot_delay (Krzysztof Wilczyński)

- Apply D2 transition delay as microseconds, not milliseconds (Bjorn
  Helgaas)

* pci/pm:
  PCI/PM: Revert "PCI/PM: Apply D2 delay as milliseconds, not microseconds"
  PCI/PM: Remove unused PCI_PM_BUS_WAIT
  PCI/PM: Rename pci_dev.d3_delay to d3hot_delay
  PCI/PM: Remove unused pcibios_pm_ops
---

0d2493ab08b4cb6a8fc3e07a8e5667ac077f2e1a