summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-13 14:48:20 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-13 14:48:20 +0200
commit2cf9ba290536fa8c03018d073555488ae000d8ee (patch)
tree434b45d7e4103ec3fcd2bb2e284fbff1addeefa8 /drivers/base
parentfe5975b1b8b21e2a17ac80592099b9aa6efb5899 (diff)
parent6b61d49a55796dbbc479eeb4465e59fd656c719c (diff)
parente0e9ce390d7bc6a705653d4a8aa4ea92c9a65e53 (diff)
parentc6e331312ebfb52b7186e5d82d517d68b4d2f2d8 (diff)
parentf63816e43d90442684cd2fd74f602cf3c5fae69c (diff)
downloadlinux-2cf9ba290536fa8c03018d073555488ae000d8ee.tar.bz2
Merge branches 'pm-core', 'pm-sleep', 'pm-pci' and 'pm-domains'
* pm-core: PM: runtime: Fix timer_expires data type on 32-bit arches PM: runtime: Remove link state checks in rpm_get/put_supplier() * pm-sleep: ACPI: EC: PM: Drop ec_no_wakeup check from acpi_ec_dispatch_gpe() ACPI: EC: PM: Flush EC work unconditionally after wakeup PM: hibernate: remove the bogus call to get_gendisk() in software_resume() PM: hibernate: Batch hibernate and resume IO requests * pm-pci: PCI/ACPI: Whitelist hotplug ports for D3 if power managed by ACPI * pm-domains: PM: domains: Allow to abort power off when no ->power_off() callback PM: domains: Rename power state enums for genpd