From: Rafael J. Wysocki Date: Thu, 29 Nov 2012 20:41:11 +0000 (+0100) Subject: Merge branch 'acpi-dev-pm' X-Git-Tag: upstream/snapshot3+hdmi~6139^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acd844333c89e8afd85e8ca47b4363789c93780d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 --- acd844333c89e8afd85e8ca47b4363789c93780d