]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:42 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:42 +0000 (23:11 +0200)
commit2668d56906d557cfa223a8513601a3252d8c5489
treeed9901ba019615f6911c0f9f1a3af180b243bc8f
parentabbaf4d552b7e9c7f1ee4204db943dba5b73f82b
parentc3dfcd5a4e5da9395a5f28a8b7caebb461285e22
Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Export rest of the subsys PM callbacks
  ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
  ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state
  ACPI / PM: Export acpi_target_system_state() to modules
drivers/acpi/scan.c
include/acpi/acpi_bus.h
include/linux/acpi.h
kernel/power/suspend.c