diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 15:23:09 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 15:23:09 +0300 |
| commit | 8f8e5c3e2796eaf150d6262115af12707c2616dd (patch) | |
| tree | 85f3ec09ce6960fd57c85610a5c97841f2ded9ba /drivers/hwmon/max1111.c | |
| parent | 9a5f2c871af4cf6bd63ddb20061faa7049103350 (diff) | |
| parent | de3ef1eb1cd0cc3a75f7a3661e10ed827f370ab8 (diff) | |
| download | linux-8f8e5c3e2796eaf150d6262115af12707c2616dd.tar.xz | |
Merge branch 'acpi-pm'
* acpi-pm:
PM / core: Drop run_wake flag from struct dev_pm_info
PCI / PM: Simplify device wakeup settings code
PCI / PM: Drop pme_interrupt flag from struct pci_dev
ACPI / PM: Consolidate device wakeup settings code
ACPI / PM: Drop run_wake from struct acpi_device_wakeup_flags
ACPI / sleep: EC-based wakeup from suspend-to-idle on recent systems
platform: x86: intel-hid: Wake up the system from suspend-to-idle
platform: x86: intel-vbtn: Wake up the system from suspend-to-idle
ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle
platform/x86: Add driver for ACPI INT0002 Virtual GPIO device
PCI / PM: Restore PME Enable if skipping wakeup setup
PM / sleep: Print timing information if debug is enabled
ACPI / PM: Clean up device wakeup enable/disable code
ACPI / PM: Change log level of wakeup-related message
USB / PCI / PM: Allow the PCI core to do the resume cleanup
ACPI / PM: Run wakeup notify handlers synchronously
Conflicts:
drivers/base/power/main.c
Diffstat (limited to 'drivers/hwmon/max1111.c')
0 files changed, 0 insertions, 0 deletions