diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 20:41:11 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 20:41:11 (GMT) |
commit | acd844333c89e8afd85e8ca47b4363789c93780d (patch) | |
tree | eeff2cc070e8e7df4f1e4b71c9a396cbbf9ee408 /arch/x86/kernel | |
parent | c8b6817103b23ed42114516fea901c2f61271506 (diff) | |
parent | b88ce2a41562d1a9554f209e0f31a32d9f473794 (diff) | |
download | linux-fsl-qoriq-acd844333c89e8afd85e8ca47b4363789c93780d.tar.xz |
Merge branch 'acpi-dev-pm'
* acpi-dev-pm:
ACPI / PM: Allow attach/detach routines to change device power states
ACPI / PM: Introduce os_accessible flag for power_state
ACPI / PM: Add check preventing transitioning to non-D0 state from D3.
ACPI / PM: Fix build problem when CONFIG_ACPI or CONFIG_PM is not set
ACPI / PM: Fix build problem related to acpi_target_system_state()
ACPI / PM: Provide ACPI PM callback routines for subsystems
ACPI / PM: Move device PM functions related to sleep states
ACPI / PM: Provide device PM functions operating on struct acpi_device
ACPI / PM: Split device wakeup management routines
ACPI / PM: Move runtime remote wakeup setup routine to device_pm.c
ACPI / PM: Move device power state selection routine to device_pm.c
ACPI / PM: Move routines for adding/removing device wakeup notifiers
ACPI / PM: Fix device PM kernedoc comments and #ifdefs
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions