]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:30:08 +0000 (18:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:30:08 +0000 (18:30 +0200)
commit371440ad543d78f91a1d69f7cb910e3d89889086
treed27b9e5dfa4f3de2ef6bd6b1bf8a21300d1e8880
parent77c1b791e1551a8b3dc1fc6057d8a955cd563129
parent4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34
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/linux/acpi.h
kernel/power/suspend.c